From d80880b097d08f9ab9dda54355216890a4b345dc Mon Sep 17 00:00:00 2001 From: rb7147 Date: Wed, 26 Jul 2017 10:11:15 -0400 Subject: [POLICY-117] Resolve the Policy Critical issues Change-Id: Ice72d7fa40151bff5db42f5dd632f04a3853b094 Signed-off-by: rb7147 --- .../policy/controller/CreateBRMSParamController.java | 1 - .../java/org/openecomp/policy/controller/PDPController.java | 1 - .../org/openecomp/policy/admin/PolicyManagerServletTest.java | 11 +++++++++++ .../controller/CreateDcaeMicroServiceControllerTest.java | 1 - 4 files changed, 11 insertions(+), 3 deletions(-) (limited to 'POLICY-SDK-APP/src') diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateBRMSParamController.java b/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateBRMSParamController.java index 4f4838dc7..18ad9fc58 100644 --- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateBRMSParamController.java +++ b/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateBRMSParamController.java @@ -53,7 +53,6 @@ import org.openecomp.portalsdk.core.controller.RestrictedBaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.ModelAndView; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PDPController.java b/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PDPController.java index 6ef7165b3..c2c0bc867 100644 --- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PDPController.java +++ b/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PDPController.java @@ -48,7 +48,6 @@ import org.openecomp.portalsdk.core.web.support.UserUtils; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.ModelAndView; import com.att.research.xacml.api.pap.PAPException; import com.att.research.xacml.api.pap.PDPPolicy; diff --git a/POLICY-SDK-APP/src/test/java/org/openecomp/policy/admin/PolicyManagerServletTest.java b/POLICY-SDK-APP/src/test/java/org/openecomp/policy/admin/PolicyManagerServletTest.java index a25027679..9fd1801ae 100644 --- a/POLICY-SDK-APP/src/test/java/org/openecomp/policy/admin/PolicyManagerServletTest.java +++ b/POLICY-SDK-APP/src/test/java/org/openecomp/policy/admin/PolicyManagerServletTest.java @@ -139,6 +139,7 @@ public class PolicyManagerServletTest extends Mockito{ } } + @SuppressWarnings("static-access") @Test public void testDescribePolicy(){ PolicyManagerServlet servlet = new PolicyManagerServlet(); @@ -159,6 +160,7 @@ public class PolicyManagerServletTest extends Mockito{ } + @SuppressWarnings("static-access") @Test public void testPolicyScopeList(){ PolicyManagerServlet servlet = new PolicyManagerServlet(); @@ -186,6 +188,7 @@ public class PolicyManagerServletTest extends Mockito{ } } + @SuppressWarnings("static-access") @Test public void editBasePolicyTest(){ PolicyManagerServlet servlet = new PolicyManagerServlet(); @@ -210,6 +213,7 @@ public class PolicyManagerServletTest extends Mockito{ } } + @SuppressWarnings("static-access") @Test public void editBRMSParamPolicyTest(){ List policyData = new ArrayList<>(); @@ -255,6 +259,7 @@ public class PolicyManagerServletTest extends Mockito{ } } + @SuppressWarnings("static-access") @Test public void editBRMSRawPolicyTest(){ List policyData = new ArrayList<>(); @@ -300,6 +305,7 @@ public class PolicyManagerServletTest extends Mockito{ } } + @SuppressWarnings("static-access") @Test public void editClosedLoopFaultPolicyTest(){ List policyData = new ArrayList<>(); @@ -345,6 +351,7 @@ public class PolicyManagerServletTest extends Mockito{ } } + @SuppressWarnings("static-access") @Test public void editClosedLoopPMPolicyTest(){ List policyData = new ArrayList<>(); @@ -390,6 +397,7 @@ public class PolicyManagerServletTest extends Mockito{ } } + @SuppressWarnings("static-access") @Test public void editMicroServicePolicyTest(){ GroupPolicyScopeList groupData = new GroupPolicyScopeList(); @@ -443,6 +451,7 @@ public class PolicyManagerServletTest extends Mockito{ } } + @SuppressWarnings("static-access") @Test public void editFirewallPolicyTest(){ List policyData = new ArrayList<>(); @@ -488,6 +497,7 @@ public class PolicyManagerServletTest extends Mockito{ } } + @SuppressWarnings("static-access") @Test public void editActionPolicyTest(){ List policyData = new ArrayList<>(); @@ -531,6 +541,7 @@ public class PolicyManagerServletTest extends Mockito{ } } + @SuppressWarnings("static-access") @Test public void editDecisionPolicyTest(){ List policyData = new ArrayList<>(); diff --git a/POLICY-SDK-APP/src/test/java/org/openecomp/policy/controller/CreateDcaeMicroServiceControllerTest.java b/POLICY-SDK-APP/src/test/java/org/openecomp/policy/controller/CreateDcaeMicroServiceControllerTest.java index ca915440e..b4619b852 100644 --- a/POLICY-SDK-APP/src/test/java/org/openecomp/policy/controller/CreateDcaeMicroServiceControllerTest.java +++ b/POLICY-SDK-APP/src/test/java/org/openecomp/policy/controller/CreateDcaeMicroServiceControllerTest.java @@ -169,7 +169,6 @@ public class CreateDcaeMicroServiceControllerTest { //expect: uniqueKeys should contain a string value CreateDcaeMicroServiceController controllerA = new CreateDcaeMicroServiceController(); String str = "testing\\.byCorrectWay\\.OfDATA"; - String value = null; assertEquals(1, controllerA.stringBetweenDots(str)); //expect: uniqueKeys should not contain a string value -- cgit 1.2.3-korg