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 --- .../application/naming/NamingPdpApplication.java | 25 +++++++++------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'applications/naming/src') diff --git a/applications/naming/src/main/java/org/onap/policy/xacml/pdp/application/naming/NamingPdpApplication.java b/applications/naming/src/main/java/org/onap/policy/xacml/pdp/application/naming/NamingPdpApplication.java index 5d45bfc5..fe781a96 100644 --- a/applications/naming/src/main/java/org/onap/policy/xacml/pdp/application/naming/NamingPdpApplication.java +++ b/applications/naming/src/main/java/org/onap/policy/xacml/pdp/application/naming/NamingPdpApplication.java @@ -23,7 +23,6 @@ package org.onap.policy.xacml.pdp.application.naming; import java.util.Arrays; -import java.util.List; import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier; import org.onap.policy.pdp.xacml.application.common.ToscaPolicyTranslator; import org.onap.policy.pdp.xacml.application.common.std.StdCombinedPolicyResultsTranslator; @@ -31,29 +30,25 @@ import org.onap.policy.pdp.xacml.application.common.std.StdXacmlApplicationServi public class NamingPdpApplication extends StdXacmlApplicationServiceProvider { - private static final ToscaPolicyTypeIdentifier supportedPolicy = new ToscaPolicyTypeIdentifier( + private static final ToscaPolicyTypeIdentifier namingPolicyType = new ToscaPolicyTypeIdentifier( "onap.policies.Naming", "1.0.0"); private StdCombinedPolicyResultsTranslator translator = new StdCombinedPolicyResultsTranslator(); - @Override - public String applicationName() { - return "naming"; - } - - @Override - public List actionDecisionsSupported() { - return Arrays.asList("naming"); - } + /** + * Constructor. + */ + public NamingPdpApplication() { + super(); - @Override - public synchronized List supportedPolicyTypes() { - return Arrays.asList(supportedPolicy); + applicationName = "naming"; + actions = Arrays.asList("naming"); + supportedPolicyTypes.add(namingPolicyType); } @Override public boolean canSupportPolicyType(ToscaPolicyTypeIdentifier policyTypeId) { - return supportedPolicy.equals(policyTypeId); + return namingPolicyType.equals(policyTypeId); } @Override -- cgit 1.2.3-korg