diff options
author | 2020-12-04 09:52:25 +0000 | |
---|---|---|
committer | 2020-12-04 09:52:25 +0000 | |
commit | 7ab47ceb8b392da60f7034fba55f9cf3b257585e (patch) | |
tree | c82693b7b679a0fa3da54afafad1be40d947b697 /models-interactions/model-actors | |
parent | d0e612882c86222dbc1560b1282de42cd245a905 (diff) | |
parent | e7b9884cc75d9346dc56145725d2aa69a6cd4f43 (diff) |
Merge "Address sonar issues in policy/models"
Diffstat (limited to 'models-interactions/model-actors')
3 files changed, 5 insertions, 5 deletions
diff --git a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoOperation.java b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoOperation.java index 9020c0b35..e3328e976 100644 --- a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoOperation.java +++ b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoOperation.java @@ -89,7 +89,7 @@ public abstract class SoOperation extends HttpOperation<SoResponse> { * @param config configuration for this operation * @param propertyNames names of properties required by this operation */ - public SoOperation(ControlLoopOperationParams params, HttpPollingConfig config, List<String> propertyNames) { + protected SoOperation(ControlLoopOperationParams params, HttpPollingConfig config, List<String> propertyNames) { super(params, config, SoResponse.class, propertyNames); this.modelCustomizationId = null; @@ -109,7 +109,7 @@ public abstract class SoOperation extends HttpOperation<SoResponse> { * @param propertyNames names of properties required by this operation * @param targetEntityIds Target Entity information */ - public SoOperation(ControlLoopOperationParams params, HttpPollingConfig config, List<String> propertyNames, + protected SoOperation(ControlLoopOperationParams params, HttpPollingConfig config, List<String> propertyNames, Map<String, String> targetEntityIds) { super(params, config, SoResponse.class, propertyNames); @@ -345,7 +345,7 @@ public abstract class SoOperation extends HttpOperation<SoResponse> { * IllegalArgumentException if the desired data item is not found. */ - protected GenericVnf getVnfItem(SoModelInfo soModelInfo) { + protected GenericVnf getVnfItem() { return getRequiredProperty(OperationProperties.AAI_VNF, "generic VNF"); } diff --git a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleCreate.java b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleCreate.java index f5c860e11..b778c10d7 100644 --- a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleCreate.java +++ b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleCreate.java @@ -126,7 +126,7 @@ public class VfModuleCreate extends SoOperation { */ protected Pair<String, SoRequest> makeRequest() { final SoModelInfo soModelInfo = prepareSoModelInfo(); - final GenericVnf vnfItem = getVnfItem(soModelInfo); + final GenericVnf vnfItem = getVnfItem(); final ServiceInstance vnfServiceItem = getServiceInstance(); final Tenant tenantItem = getDefaultTenant(); final CloudRegion cloudRegionItem = getDefaultCloudRegion(); diff --git a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleDelete.java b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleDelete.java index 9adb62c83..b82444049 100644 --- a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleDelete.java +++ b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleDelete.java @@ -207,7 +207,7 @@ public class VfModuleDelete extends SoOperation { */ protected Pair<String, SoRequest> makeRequest() { final SoModelInfo soModelInfo = prepareSoModelInfo(); - final GenericVnf vnfItem = getVnfItem(soModelInfo); + final GenericVnf vnfItem = getVnfItem(); final ServiceInstance vnfServiceItem = getServiceInstance(); final Tenant tenantItem = getDefaultTenant(); final CloudRegion cloudRegionItem = getDefaultCloudRegion(); |