From 7ae3ab19d0556a0308f0d293d4dd2e58dd3d3929 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Fri, 2 Oct 2020 09:13:13 -0400 Subject: Remove duplicated code Initially, just moving the applicationName and actions as protected fields got rid of the sonar issue. I included also the supportedPolicyTypes also. But that triggered another sonar duplicate code, so I had to rename a few private fields to rid that. Seems like a very sensitive sonar detection that results in kludgy code. Issue-ID: POLICY-2681 Change-Id: Ie79a95786cdb80381cbce4b182e9e66a2776e0dd Signed-off-by: Pamela Dragosh --- .../optimization/OptimizationPdpApplication.java | 23 +++++----------------- 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'applications/optimization/src/main') diff --git a/applications/optimization/src/main/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplication.java b/applications/optimization/src/main/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplication.java index 8d337e47..1cc94ed6 100644 --- a/applications/optimization/src/main/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplication.java +++ b/applications/optimization/src/main/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplication.java @@ -28,10 +28,8 @@ import com.att.research.xacml.api.Decision; import com.att.research.xacml.api.Response; import com.att.research.xacml.api.Result; import java.nio.file.Path; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.Map; import org.apache.commons.lang3.tuple.Pair; @@ -66,12 +64,16 @@ public class OptimizationPdpApplication extends StdXacmlApplicationServiceProvid public static final String ONAP_OPTIMIZATION_DERIVED_POLICY_TYPE = "onap.policies.optimization."; private OptimizationPdpApplicationTranslator translator = new OptimizationPdpApplicationTranslator(); - private List supportedPolicyTypes = new ArrayList<>(); /** * Constructor. */ public OptimizationPdpApplication() { + super(); + + applicationName = "optimization"; + actions = Arrays.asList("optimize"); + this.supportedPolicyTypes.add(new ToscaPolicyTypeIdentifier(POLICYTYPE_AFFINITY, STRING_VERSION100)); this.supportedPolicyTypes.add(new ToscaPolicyTypeIdentifier(POLICYTYPE_DISTANCE, STRING_VERSION100)); this.supportedPolicyTypes.add(new ToscaPolicyTypeIdentifier(POLICYTYPE_HPA, STRING_VERSION100)); @@ -83,16 +85,6 @@ public class OptimizationPdpApplication extends StdXacmlApplicationServiceProvid this.supportedPolicyTypes.add(new ToscaPolicyTypeIdentifier(POLICYTYPE_VNF, STRING_VERSION100)); } - @Override - public String applicationName() { - return "optimization"; - } - - @Override - public List actionDecisionsSupported() { - return Arrays.asList("optimize"); - } - @Override public void initialize(Path pathForData, RestServerParameters policyApiParameters) throws XacmlApplicationException { @@ -108,11 +100,6 @@ public class OptimizationPdpApplication extends StdXacmlApplicationServiceProvid super.initialize(pathForData, policyApiParameters); } - @Override - public synchronized List supportedPolicyTypes() { - return Collections.unmodifiableList(supportedPolicyTypes); - } - @Override public boolean canSupportPolicyType(ToscaPolicyTypeIdentifier policyTypeId) { // -- cgit 1.2.3-korg