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 --- .../pdp/application/guard/GuardPdpApplication.java | 24 ++++++---------------- 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'applications/guard/src') diff --git a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplication.java b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplication.java index 982c14b7..bb1b7588 100644 --- a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplication.java +++ b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplication.java @@ -22,9 +22,7 @@ package org.onap.policy.xacml.pdp.application.guard; -import java.util.ArrayList; 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.StdXacmlApplicationServiceProvider; @@ -40,7 +38,7 @@ import org.slf4j.LoggerFactory; public class GuardPdpApplication extends StdXacmlApplicationServiceProvider { private static final Logger LOGGER = LoggerFactory.getLogger(GuardPdpApplication.class); private static final String STRING_VERSION100 = "1.0.0"; - private List supportedPolicyTypes = new ArrayList<>(); + private GuardTranslator guardTranslator = new GuardTranslator(); private CoordinationGuardTranslator coordinationTranslator = new CoordinationGuardTranslator(); @@ -49,6 +47,11 @@ public class GuardPdpApplication extends StdXacmlApplicationServiceProvider { * */ public GuardPdpApplication() { + super(); + + applicationName = "guard"; + actions = Arrays.asList("guard"); + this.supportedPolicyTypes.add(new ToscaPolicyTypeIdentifier( GuardTranslator.POLICYTYPE_FREQUENCY, STRING_VERSION100)); @@ -66,21 +69,6 @@ public class GuardPdpApplication extends StdXacmlApplicationServiceProvider { STRING_VERSION100)); } - @Override - public String applicationName() { - return "guard"; - } - - @Override - public List actionDecisionsSupported() { - return Arrays.asList("guard"); - } - - @Override - public List supportedPolicyTypes() { - return supportedPolicyTypes; - } - @Override public boolean canSupportPolicyType(ToscaPolicyTypeIdentifier policyTypeId) { // -- cgit 1.2.3-korg