From ffc5d8eee3254978f1197e4f97590df74c254273 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 16 Apr 2026 13:10:24 +0200 Subject: [PATCH] ExtensionsManagerImpl: minor changes --- .../extensions/manager/ExtensionsManagerImpl.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java index 8db11f96e34..734c98956fa 100644 --- a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java +++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java @@ -1232,7 +1232,7 @@ public class ExtensionsManagerImpl extends ManagerBase implements ExtensionsMana */ private Set resolveExtensionServices(Extension extension) { Map extDetails = extensionDetailsDao.listDetailsKeyPairs(extension.getId()); - Set parsed = parseServicesFromDetailKeys(extDetails); + Set parsed = parseNetworkServicesFromDetailKeys(extDetails); if (!parsed.isEmpty()) { return parsed; } @@ -1244,8 +1244,7 @@ public class ExtensionsManagerImpl extends ManagerBase implements ExtensionsMana * Resolves the set of service names from the extension detail map. * From {@code network.services} comma-separated key. */ - @SuppressWarnings("deprecation") - private Set parseServicesFromDetailKeys(Map extDetails) { + private Set parseNetworkServicesFromDetailKeys(Map extDetails) { if (extDetails == null) { return Collections.emptySet(); } @@ -1274,7 +1273,6 @@ public class ExtensionsManagerImpl extends ManagerBase implements ExtensionsMana * extension detail map. From the split keys * {@code network.services} + {@code network.service.capabilities}. */ - @SuppressWarnings("deprecation") private Map> buildCapabilitiesFromDetailKeys( Map extDetails) { if (extDetails == null) { @@ -1282,7 +1280,7 @@ public class ExtensionsManagerImpl extends ManagerBase implements ExtensionsMana } // New split format if (extDetails.containsKey(ExtensionHelper.NETWORK_SERVICES_DETAIL_KEY)) { - Set serviceNames = parseServicesFromDetailKeys(extDetails); + Set serviceNames = parseNetworkServicesFromDetailKeys(extDetails); if (!serviceNames.isEmpty()) { JsonObject capsObj = null; if (extDetails.containsKey(ExtensionHelper.NETWORK_SERVICE_CAPABILITIES_DETAIL_KEY)) { @@ -1354,7 +1352,7 @@ public class ExtensionsManagerImpl extends ManagerBase implements ExtensionsMana return; } Map extDetails = extensionDetailsDao.listDetailsKeyPairs(extension.getId()); - Set allowedServices = parseServicesFromDetailKeys(extDetails); + Set allowedServices = parseNetworkServicesFromDetailKeys(extDetails); if (allowedServices.isEmpty()) { // No services declared → accept any return;