Skip to content

Commit 9c26a42

Browse files
committed
ExtensionsManagerImpl: minor changes
1 parent 8ae1856 commit 9c26a42

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,7 +1232,7 @@ protected ExtensionResourceMap registerExtensionWithPhysicalNetwork(PhysicalNetw
12321232
*/
12331233
private Set<String> resolveExtensionServices(Extension extension) {
12341234
Map<String, String> extDetails = extensionDetailsDao.listDetailsKeyPairs(extension.getId());
1235-
Set<String> parsed = parseServicesFromDetailKeys(extDetails);
1235+
Set<String> parsed = parseNetworkServicesFromDetailKeys(extDetails);
12361236
if (!parsed.isEmpty()) {
12371237
return parsed;
12381238
}
@@ -1244,8 +1244,7 @@ private Set<String> resolveExtensionServices(Extension extension) {
12441244
* Resolves the set of service names from the extension detail map.
12451245
* From {@code network.services} comma-separated key.
12461246
*/
1247-
@SuppressWarnings("deprecation")
1248-
private Set<String> parseServicesFromDetailKeys(Map<String, String> extDetails) {
1247+
private Set<String> parseNetworkServicesFromDetailKeys(Map<String, String> extDetails) {
12491248
if (extDetails == null) {
12501249
return Collections.emptySet();
12511250
}
@@ -1274,15 +1273,14 @@ private Set<String> parseServicesFromDetailKeys(Map<String, String> extDetails)
12741273
* extension detail map. From the split keys
12751274
* {@code network.services} + {@code network.service.capabilities}.
12761275
*/
1277-
@SuppressWarnings("deprecation")
12781276
private Map<Service, Map<Capability, String>> buildCapabilitiesFromDetailKeys(
12791277
Map<String, String> extDetails) {
12801278
if (extDetails == null) {
12811279
return new HashMap<>();
12821280
}
12831281
// New split format
12841282
if (extDetails.containsKey(ExtensionHelper.NETWORK_SERVICES_DETAIL_KEY)) {
1285-
Set<String> serviceNames = parseServicesFromDetailKeys(extDetails);
1283+
Set<String> serviceNames = parseNetworkServicesFromDetailKeys(extDetails);
12861284
if (!serviceNames.isEmpty()) {
12871285
JsonObject capsObj = null;
12881286
if (extDetails.containsKey(ExtensionHelper.NETWORK_SERVICE_CAPABILITIES_DETAIL_KEY)) {
@@ -1354,7 +1352,7 @@ protected void validateNetworkServicesSubset(Extension extension, String service
13541352
return;
13551353
}
13561354
Map<String, String> extDetails = extensionDetailsDao.listDetailsKeyPairs(extension.getId());
1357-
Set<String> allowedServices = parseServicesFromDetailKeys(extDetails);
1355+
Set<String> allowedServices = parseNetworkServicesFromDetailKeys(extDetails);
13581356
if (allowedServices.isEmpty()) {
13591357
// No services declared → accept any
13601358
return;

0 commit comments

Comments
 (0)