From 9450c8d0102b9188933b5d26193df754a70a7157 Mon Sep 17 00:00:00 2001 From: rb7147 Date: Fri, 16 Feb 2018 13:46:06 -0500 Subject: Added Junis for Policy ONAP-REST Cleaned the unused constructors. Cleaned the unused code. Added Junits for all JPAS. Renamed the Junit class names on removing classes. Issue-ID: POLICY-603 Change-Id: I0709ccecd7a2f3ec49367ff85f5a6d273479493e Signed-off-by: rb7147 --- .../onap/policy/pap/xacml/rest/XACMLPapServlet.java | 2 -- .../rest/controller/DictionaryImportController.java | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) (limited to 'ONAP-PAP-REST/src/main/java/org') diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java index cf1e6fc6e..392c32ac5 100644 --- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java +++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java @@ -40,7 +40,6 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Properties; import java.util.Scanner; @@ -89,7 +88,6 @@ import org.onap.policy.xacml.api.pap.ONAPPapEngineFactory; import org.onap.policy.xacml.api.pap.OnapPDP; import org.onap.policy.xacml.api.pap.OnapPDPGroup; import org.onap.policy.xacml.api.pap.PAPPolicyEngine; -import org.onap.policy.xacml.std.pap.StdPAPPolicy; import org.onap.policy.xacml.std.pap.StdPDP; import org.onap.policy.xacml.std.pap.StdPDPGroup; import org.onap.policy.xacml.std.pap.StdPDPItemSetChangeNotifier.StdItemSetChangeListener; diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java index c79f203cd..e2317e416 100644 --- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java +++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java @@ -161,7 +161,7 @@ public class DictionaryImportController { if(dictionaryName.startsWith("ActionPolicyDictionary")){ dictionaryImportExists = true; for(int i = 1; i< dictSheet.size(); i++){ - ActionPolicyDict attribute = new ActionPolicyDict("", userId); + ActionPolicyDict attribute = new ActionPolicyDict(); UserInfo userinfo = new UserInfo(); userinfo.setUserLoginId(userId); attribute.setUserCreatedBy(userinfo); @@ -196,7 +196,7 @@ public class DictionaryImportController { if(dictionaryName.startsWith("OnapName")){ dictionaryImportExists = true; for(int i = 1; i< dictSheet.size(); i++){ - OnapName attribute = new OnapName("", userId); + OnapName attribute = new OnapName(); UserInfo userinfo = new UserInfo(); userinfo.setUserLoginId(userId); attribute.setUserCreatedBy(userinfo); @@ -256,7 +256,7 @@ public class DictionaryImportController { if(dictionaryName.startsWith("VNFType")){ dictionaryImportExists = true; for(int i = 1; i< dictSheet.size(); i++){ - VNFType attribute = new VNFType("", userId); + VNFType attribute = new VNFType(); UserInfo userinfo = new UserInfo(); userinfo.setUserLoginId(userId); attribute.setUserCreatedBy(userinfo); @@ -276,7 +276,7 @@ public class DictionaryImportController { if(dictionaryName.startsWith("VSCLAction")){ dictionaryImportExists = true; for(int i = 1; i< dictSheet.size(); i++){ - VSCLAction attribute = new VSCLAction("", userId); + VSCLAction attribute = new VSCLAction(); UserInfo userinfo = new UserInfo(); userinfo.setUserLoginId(userId); attribute.setUserCreatedBy(userinfo); @@ -316,7 +316,7 @@ public class DictionaryImportController { if(dictionaryName.startsWith("ClosedLoopSite")){ dictionaryImportExists = true; for(int i = 1; i< dictSheet.size(); i++){ - ClosedLoopSite attribute = new ClosedLoopSite("", userId); + ClosedLoopSite attribute = new ClosedLoopSite(); UserInfo userinfo = new UserInfo(); userinfo.setUserLoginId(userId); attribute.setUserCreatedBy(userinfo); @@ -336,7 +336,7 @@ public class DictionaryImportController { if(dictionaryName.startsWith("PEPOptions")){ dictionaryImportExists = true; for(int i = 1; i< dictSheet.size(); i++){ - PEPOptions attribute = new PEPOptions("", userId); + PEPOptions attribute = new PEPOptions(); UserInfo userinfo = new UserInfo(); userinfo.setUserLoginId(userId); attribute.setUserCreatedBy(userinfo); @@ -359,7 +359,7 @@ public class DictionaryImportController { if(dictionaryName.startsWith("VarbindDictionary")){ dictionaryImportExists = true; for(int i = 1; i< dictSheet.size(); i++){ - VarbindDictionary attribute = new VarbindDictionary("", userId); + VarbindDictionary attribute = new VarbindDictionary(); UserInfo userinfo = new UserInfo(); userinfo.setUserLoginId(userId); attribute.setUserCreatedBy(userinfo); @@ -448,7 +448,7 @@ public class DictionaryImportController { if(dictionaryName.startsWith("Settings")){ dictionaryImportExists = true; for(int i = 1; i< dictSheet.size(); i++){ - DecisionSettings attribute = new DecisionSettings("", userId); + DecisionSettings attribute = new DecisionSettings(); UserInfo userinfo = new UserInfo(); userinfo.setUserLoginId(userId); attribute.setUserCreatedBy(userinfo); @@ -632,7 +632,7 @@ public class DictionaryImportController { if(dictionaryName.startsWith("TermList")){ dictionaryImportExists = true; for(int i = 1; i< dictSheet.size(); i++){ - TermList attribute = new TermList("", userId); + TermList attribute = new TermList(); UserInfo userinfo = new UserInfo(); userinfo.setUserLoginId(userId); attribute.setUserCreatedBy(userinfo); @@ -673,7 +673,7 @@ public class DictionaryImportController { if(dictionaryName.startsWith("SearchCriteria")){ dictionaryImportExists = true; for(int i = 1; i< dictSheet.size(); i++){ - DescriptiveScope attribute = new DescriptiveScope("", userId); + DescriptiveScope attribute = new DescriptiveScope(); UserInfo userinfo = new UserInfo(); userinfo.setUserLoginId(userId); attribute.setUserCreatedBy(userinfo); -- cgit 1.2.3-korg