summaryrefslogtreecommitdiffstats
path: root/ONAP-PAP-REST/src/main/java/org/onap
diff options
context:
space:
mode:
authorTej, Tarun <tt3868@att.com>2017-08-24 12:13:12 -0400
committerTarun Tej Velaga <tt3868@att.com>2017-08-24 17:18:56 +0000
commited2bcd773ec3dbe07311bad597ec664c4e38c009 (patch)
treee8a96b23e150e75cbb1d1729e1dcd825175c90f5 /ONAP-PAP-REST/src/main/java/org/onap
parentcbc5914ca2c1770797f6ad2a05ea9d7c30a55b63 (diff)
Fixes for missed sonar critical issues
Few fixes to the missed sonar critical issues and import warning fixes which are part of sonar critical fixes. Issue-Id: POLICY-113 Change-Id: If5010e984020b673e058cc1d01a8964a2354796d Signed-off-by: Tarun Tej Velaga <tt3868@att.com>
Diffstat (limited to 'ONAP-PAP-REST/src/main/java/org/onap')
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandler.java26
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandler.java3
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/SavePolicyHandler.java4
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/DictionaryService.java143
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/ImportService.java1
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/JPAUtils.java6
6 files changed, 85 insertions, 98 deletions
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandler.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandler.java
index a18505478..ab0492312 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandler.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandler.java
@@ -37,6 +37,7 @@ import org.onap.policy.common.logging.ONAPLoggingContext;
import org.onap.policy.common.logging.eelf.MessageCodes;
import org.onap.policy.common.logging.eelf.PolicyLogger;
import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
import org.onap.policy.pap.xacml.rest.components.PolicyDBDaoTransaction;
import org.onap.policy.pap.xacml.rest.elk.client.PolicyElasticSearchController;
@@ -51,8 +52,7 @@ import org.onap.policy.xacml.api.XACMLErrorConstants;
import org.onap.policy.xacml.api.pap.OnapPDPGroup;
import org.onap.policy.xacml.std.pap.StdPAPPolicy;
import org.onap.policy.xacml.std.pap.StdPDPGroup;
-import org.onap.policy.common.logging.flexlogger.FlexLogger;
-import org.onap.policy.common.logging.flexlogger.Logger;
+
import com.att.research.xacml.api.pap.PAPException;
import com.att.research.xacml.api.pap.PDPPolicy;
import com.att.research.xacml.util.XACMLProperties;
@@ -62,12 +62,7 @@ public class DeleteHandler {
private OnapPDPGroup newgroup;
private static Logger logger = FlexLogger.getLogger(DeleteHandler.class);
- private static String papDbDriver = null;
- private static String papDbUrl = null;
- private static String papDbUser = null;
- private static String papDbPassword = null;
-
- public static void doAPIDeleteFromPAP(HttpServletRequest request, HttpServletResponse response, ONAPLoggingContext loggingContext) throws IOException, SQLException {
+ public void doAPIDeleteFromPAP(HttpServletRequest request, HttpServletResponse response, ONAPLoggingContext loggingContext) throws IOException, SQLException {
// get the request content into a String
String json = null;
java.util.Scanner scanner = new java.util.Scanner(request.getInputStream());
@@ -88,10 +83,10 @@ public class DeleteHandler {
PolicyEntity policyEntity = null;
JPAUtils jpaUtils = null;
- papDbDriver = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_DB_DRIVER);
- papDbUrl = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_DB_URL);
- papDbUser = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_DB_USER);
- papDbPassword = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_DB_PASSWORD);
+ String papDbDriver = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_DB_DRIVER);
+ String papDbUrl = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_DB_URL);
+ String papDbUser = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_DB_USER);
+ String papDbPassword = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_DB_PASSWORD);
Connection con = null;
try {
@@ -110,7 +105,7 @@ public class DeleteHandler {
response.setStatus(HttpServletResponse.SC_ACCEPTED);
return;
}
- EntityManager em = (EntityManager) XACMLPapServlet.getEmf().createEntityManager();
+ EntityManager em = XACMLPapServlet.getEmf().createEntityManager();
Query policyEntityQuery = null;
try{
if(policyName.endsWith(".xml")){
@@ -280,7 +275,7 @@ public class DeleteHandler {
}
}
- public static String deletePolicyEntityData(EntityManager em, PolicyEntity policyEntity) throws SQLException{
+ public static String deletePolicyEntityData(EntityManager em, PolicyEntity policyEntity){
PolicyElasticSearchController controller = new PolicyElasticSearchController();
PolicyRestAdapter policyData = new PolicyRestAdapter();
String policyName = policyEntity.getPolicyName();
@@ -473,8 +468,7 @@ public class DeleteHandler {
public static DeleteHandler getInstance() {
try {
Class<?> deleteHandler = Class.forName(XACMLProperties.getProperty("deletePolicy.impl.className", DeleteHandler.class.getName()));
- DeleteHandler instance = (DeleteHandler) deleteHandler.newInstance();
- return instance;
+ return (DeleteHandler) deleteHandler.newInstance();
} catch (Exception e) {
logger.error(e.getMessage(),e);
}
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandler.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandler.java
index d30c70204..6aec7a9bc 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandler.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandler.java
@@ -22,10 +22,9 @@ package org.onap.policy.pap.xacml.rest.handler;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.onap.policy.common.logging.eelf.PolicyLogger;
-import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.Logger;
+
import com.att.research.xacml.util.XACMLProperties;
public interface DictionaryHandler {
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/SavePolicyHandler.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/SavePolicyHandler.java
index 3864ba1fd..c86ded43f 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/SavePolicyHandler.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/SavePolicyHandler.java
@@ -26,14 +26,14 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.parsers.ParserConfigurationException;
+
+import org.onap.policy.common.logging.eelf.PolicyLogger;
import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.Logger;
-import org.onap.policy.common.logging.eelf.PolicyLogger;
import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
import org.onap.policy.pap.xacml.rest.policycontroller.PolicyCreation;
import org.onap.policy.rest.adapter.PolicyRestAdapter;
import org.onap.policy.utils.PolicyUtils;
-import org.onap.policy.xacml.api.XACMLErrorConstants;
import org.onap.policy.xacml.std.pap.StdPAPPolicy;
import org.xml.sax.SAXException;
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/DictionaryService.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/DictionaryService.java
index 1c873561f..c96f85dcf 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/DictionaryService.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/DictionaryService.java
@@ -20,12 +20,10 @@
package org.onap.policy.pap.xacml.rest.service;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.onap.policy.common.logging.flexlogger.FlexLogger;
-import org.onap.policy.common.logging.flexlogger.Logger;
import org.onap.policy.pap.xacml.rest.controller.ActionPolicyDictionaryController;
import org.onap.policy.pap.xacml.rest.controller.BRMSDictionaryController;
import org.onap.policy.pap.xacml.rest.controller.ClosedLoopDictionaryController;
@@ -37,20 +35,17 @@ import org.onap.policy.pap.xacml.rest.controller.FirewallDictionaryController;
import org.onap.policy.pap.xacml.rest.controller.MicroServiceDictionaryController;
import org.onap.policy.pap.xacml.rest.controller.PolicyScopeDictionaryController;
import org.onap.policy.pap.xacml.rest.controller.SafePolicyController;
-import org.onap.policy.xacml.api.XACMLErrorConstants;
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.ModelAndView;
@Service("DictionaryService")
public class DictionaryService {
-
- private static final Logger LOGGER = FlexLogger.getLogger(DictionaryService.class);
/*
* Methods that call the controller method directly to Save and Update dictionary data
*/
- public String saveOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException {
+ public String saveOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException {
DictionaryController dictionary = new DictionaryController();
String responseString = null;
@@ -60,7 +55,7 @@ public class DictionaryService {
}
- public String saveAttributeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveAttributeDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
DictionaryController dictionary = new DictionaryController();
String responseString = null;
@@ -69,7 +64,7 @@ public class DictionaryService {
return responseString;
}
- public String saveActionPolicyDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException {
+ public String saveActionPolicyDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException {
ActionPolicyDictionaryController action = new ActionPolicyDictionaryController();
String responseString = null;
@@ -78,7 +73,7 @@ public class DictionaryService {
return responseString;
}
- public String saveBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException {
+ public String saveBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException {
BRMSDictionaryController dictionary = new BRMSDictionaryController();
String responseString = null;
@@ -87,7 +82,7 @@ public class DictionaryService {
return responseString;
}
- public String saveVSCLAction(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveVSCLAction(HttpServletRequest request, HttpServletResponse response) throws IOException{
ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
String responseString = null;
@@ -96,7 +91,7 @@ public class DictionaryService {
return responseString;
}
- public String saveVnfType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveVnfType(HttpServletRequest request, HttpServletResponse response) throws IOException{
ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
String responseString = null;
@@ -105,7 +100,7 @@ public class DictionaryService {
return responseString;
}
- public String savePEPOptions(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String savePEPOptions(HttpServletRequest request, HttpServletResponse response) throws IOException{
ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
String responseString = null;
@@ -114,7 +109,7 @@ public class DictionaryService {
return responseString;
}
- public String saveVarbind(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveVarbind(HttpServletRequest request, HttpServletResponse response) throws IOException{
ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
String responseString = null;
@@ -123,7 +118,7 @@ public class DictionaryService {
return responseString;
}
- public String saveServiceType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveServiceType(HttpServletRequest request, HttpServletResponse response) throws IOException{
ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
String responseString = null;
@@ -132,7 +127,7 @@ public class DictionaryService {
return responseString;
}
- public String saveSiteType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveSiteType(HttpServletRequest request, HttpServletResponse response) throws IOException{
ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
String responseString = null;
@@ -141,7 +136,7 @@ public class DictionaryService {
return responseString;
}
- public String saveSettingsDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveSettingsDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
DecisionPolicyDictionaryController dictionary = new DecisionPolicyDictionaryController();
String responseString = null;
@@ -150,7 +145,7 @@ public class DictionaryService {
return responseString;
}
- public String saveDescriptiveDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveDescriptiveDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
DescriptiveDictionaryController dictionary = new DescriptiveDictionaryController();
String responseString = null;
@@ -159,7 +154,7 @@ public class DictionaryService {
return responseString;
}
- public String saveEnforcerDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveEnforcerDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
EnforcerDictionaryController dictionary = new EnforcerDictionaryController();
String responseString = null;
@@ -168,7 +163,7 @@ public class DictionaryService {
return responseString;
}
- public String saveActionListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveActionListDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
FirewallDictionaryController dictionary = new FirewallDictionaryController();
String responseString = null;
@@ -177,7 +172,7 @@ public class DictionaryService {
return responseString;
}
- public String saveProtocolListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveProtocolListDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
FirewallDictionaryController dictionary = new FirewallDictionaryController();
String responseString = null;
@@ -186,7 +181,7 @@ public class DictionaryService {
return responseString;
}
- public String saveZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
FirewallDictionaryController dictionary = new FirewallDictionaryController();
String responseString = null;
@@ -195,7 +190,7 @@ public class DictionaryService {
return responseString;
}
- public String saveSecurityZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveSecurityZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
FirewallDictionaryController dictionary = new FirewallDictionaryController();
String responseString = null;
@@ -204,7 +199,7 @@ public class DictionaryService {
return responseString;
}
- public String savePrefixListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String savePrefixListDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
FirewallDictionaryController dictionary = new FirewallDictionaryController();
String responseString = null;
@@ -213,7 +208,7 @@ public class DictionaryService {
return responseString;
}
- public String saveAddressGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveAddressGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
FirewallDictionaryController dictionary = new FirewallDictionaryController();
String responseString = null;
@@ -222,7 +217,7 @@ public class DictionaryService {
return responseString;
}
- public String saveServiceGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveServiceGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
FirewallDictionaryController dictionary = new FirewallDictionaryController();
String responseString = null;
@@ -231,7 +226,7 @@ public class DictionaryService {
return responseString;
}
- public String saveServiceListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveServiceListDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
FirewallDictionaryController dictionary = new FirewallDictionaryController();
String responseString = null;
@@ -240,7 +235,7 @@ public class DictionaryService {
return responseString;
}
- public String saveTermListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveTermListDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
FirewallDictionaryController dictionary = new FirewallDictionaryController();
String responseString = null;
@@ -252,7 +247,7 @@ public class DictionaryService {
- public String saveMicroServiceLocationDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveMicroServiceLocationDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
String responseString = null;
@@ -261,7 +256,7 @@ public class DictionaryService {
return responseString;
}
- public String saveMicroServiceConfigNameDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveMicroServiceConfigNameDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
String responseString = null;
@@ -270,7 +265,7 @@ public class DictionaryService {
return responseString;
}
- public String saveDCAEUUIDDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveDCAEUUIDDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
String responseString = null;
@@ -279,7 +274,7 @@ public class DictionaryService {
return responseString;
}
- public String saveMicroServiceModelsDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveMicroServiceModelsDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
String responseString = null;
@@ -288,7 +283,7 @@ public class DictionaryService {
return responseString;
}
- public String saveMicroServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveMicroServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
String responseString = null;
@@ -297,7 +292,7 @@ public class DictionaryService {
return responseString;
}
- public String savePSServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String savePSServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
String responseString = null;
@@ -306,7 +301,7 @@ public class DictionaryService {
return responseString;
}
- public String savePSResourceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String savePSResourceDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
String responseString = null;
@@ -315,7 +310,7 @@ public class DictionaryService {
return responseString;
}
- public String savePSTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String savePSTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
String responseString = null;
@@ -324,7 +319,7 @@ public class DictionaryService {
return responseString;
}
- public String savePSClosedLoopDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String savePSClosedLoopDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
String responseString = null;
@@ -333,7 +328,7 @@ public class DictionaryService {
return responseString;
}
- public String savePSGroupScopeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String savePSGroupScopeDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
String responseString = null;
@@ -342,7 +337,7 @@ public class DictionaryService {
return responseString;
}
- public String saveRiskTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveRiskTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
SafePolicyController dictionary = new SafePolicyController();
String responseString = null;
@@ -351,7 +346,7 @@ public class DictionaryService {
return responseString;
}
- public String saveSafePolicyWarningDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public String saveSafePolicyWarningDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
SafePolicyController dictionary = new SafePolicyController();
String responseString = null;
ModelAndView result = dictionary.saveSafePolicyWarningDictionary(request, response);
@@ -363,173 +358,173 @@ public class DictionaryService {
/*
* Methods that call the controller get methods directly to get dictionary data
*/
- public void getOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getOnapDictionary(HttpServletRequest request, HttpServletResponse response){
DictionaryController dictionary = new DictionaryController();
dictionary.getOnapNameDictionaryEntityData(request, response);
}
- public void getAttributeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getAttributeDictionary(HttpServletRequest request, HttpServletResponse response){
DictionaryController dictionary = new DictionaryController();
dictionary.getAttributeDictionaryEntityData(request, response);
}
- public void getActionPolicyDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getActionPolicyDictionary(HttpServletRequest request, HttpServletResponse response){
ActionPolicyDictionaryController action = new ActionPolicyDictionaryController();
action.getActionPolicyDictionaryEntityData(request, response);
}
- public void getBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response){
BRMSDictionaryController dictionary = new BRMSDictionaryController();
dictionary.getBRMSParamDictionaryEntityData(request, response);
}
- public void getVSCLAction(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getVSCLAction(HttpServletRequest request, HttpServletResponse response){
ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
dictionary.getVSCLActionDictionaryEntityData(request, response);
}
- public void getVnfType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getVnfType(HttpServletRequest request, HttpServletResponse response){
ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
dictionary.getVNFTypeDictionaryEntityData(request, response);
}
- public void getPEPOptions(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getPEPOptions(HttpServletRequest request, HttpServletResponse response){
ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
dictionary.getPEPOptionsDictionaryEntityData(request, response);
}
- public void getVarbind(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getVarbind(HttpServletRequest request, HttpServletResponse response){
ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
dictionary.getVarbindDictionaryEntityData(request, response);
}
- public void getServiceType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getServiceType(HttpServletRequest request, HttpServletResponse response){
ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
dictionary.getClosedLoopServiceDictionaryEntityData(request, response);
}
- public void getSiteType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getSiteType(HttpServletRequest request, HttpServletResponse response){
ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
dictionary.getClosedLoopSiteDictionaryEntityData(request, response);
}
- public void getSettingsDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getSettingsDictionary(HttpServletRequest request, HttpServletResponse response){
DecisionPolicyDictionaryController dictionary = new DecisionPolicyDictionaryController();
dictionary.getSettingsDictionaryEntityData(request, response);
}
- public void getDescriptiveDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getDescriptiveDictionary(HttpServletRequest request, HttpServletResponse response){
DescriptiveDictionaryController dictionary = new DescriptiveDictionaryController();
dictionary.getDescriptiveDictionaryEntityData(request, response);
}
- public void getEnforcerDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getEnforcerDictionary(HttpServletRequest request, HttpServletResponse response){
EnforcerDictionaryController dictionary = new EnforcerDictionaryController();
dictionary.getEnforcerDictionaryEntityData(request, response);
}
- public void getActionListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getActionListDictionary(HttpServletRequest request, HttpServletResponse response){
FirewallDictionaryController dictionary = new FirewallDictionaryController();
dictionary.getActionListDictionaryEntityData(request, response);
}
- public void getProtocolListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getProtocolListDictionary(HttpServletRequest request, HttpServletResponse response){
FirewallDictionaryController dictionary = new FirewallDictionaryController();
dictionary.getProtocolListDictionaryEntityData(request, response);
}
- public void getZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getZoneDictionary(HttpServletRequest request, HttpServletResponse response){
FirewallDictionaryController dictionary = new FirewallDictionaryController();
dictionary.getZoneDictionaryEntityData(request, response);
}
- public void getSecurityZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getSecurityZoneDictionary(HttpServletRequest request, HttpServletResponse response){
FirewallDictionaryController dictionary = new FirewallDictionaryController();
dictionary.getSecurityZoneDictionaryEntityData(request, response);
}
- public void getPrefixListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getPrefixListDictionary(HttpServletRequest request, HttpServletResponse response){
FirewallDictionaryController dictionary = new FirewallDictionaryController();
dictionary.getPrefixListDictionaryEntityData(request, response);
}
- public void getAddressGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getAddressGroupDictionary(HttpServletRequest request, HttpServletResponse response){
FirewallDictionaryController dictionary = new FirewallDictionaryController();
dictionary.getAddressGroupDictionaryEntityData(request, response);
}
- public void getServiceGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getServiceGroupDictionary(HttpServletRequest request, HttpServletResponse response){
FirewallDictionaryController dictionary = new FirewallDictionaryController();
dictionary.getServiceGroupDictionaryEntityData(request, response);
}
- public void getServiceListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getServiceListDictionary(HttpServletRequest request, HttpServletResponse response){
FirewallDictionaryController dictionary = new FirewallDictionaryController();
dictionary.getServiceListDictionaryEntityData(request, response);
}
- public void getTermListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getTermListDictionary(HttpServletRequest request, HttpServletResponse response){
FirewallDictionaryController dictionary = new FirewallDictionaryController();
dictionary.getTermListDictionaryEntityData(request, response);
}
- public void getMicroServiceLocationDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getMicroServiceLocationDictionary(HttpServletRequest request, HttpServletResponse response){
MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
dictionary.getMicroServiceLocationDictionaryEntityData(request, response);
}
- public void getMicroServiceConfigNameDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getMicroServiceConfigNameDictionary(HttpServletRequest request, HttpServletResponse response){
MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
dictionary.getMicroServiceConfigNameDictionaryEntityData(request, response);
}
- public void getDCAEUUIDDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getDCAEUUIDDictionary(HttpServletRequest request, HttpServletResponse response){
MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
dictionary.getDCAEUUIDDictionaryEntityData(request, response);
}
- public void getMicroServiceModelsDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getMicroServiceModelsDictionary(HttpServletRequest request, HttpServletResponse response){
MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
dictionary.getMicroServiceModelsDictionaryEntityData(request, response);
}
- public void getMicroServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getMicroServiceDictionary(HttpServletRequest request, HttpServletResponse response){
MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
dictionary.getMicroServiceModelsDictionaryEntityData(request, response);
}
- public void getPSServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getPSServiceDictionary(HttpServletRequest request, HttpServletResponse response){
PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
dictionary.getPSServiceEntityData(request, response);
}
- public void getPSResourceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getPSResourceDictionary(HttpServletRequest request, HttpServletResponse response){
PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
dictionary.getPSResourceEntityData(request, response);
}
- public void getPSTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getPSTypeDictionary(HttpServletRequest request, HttpServletResponse response){
PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
dictionary.getPSTypeEntityData(request, response);
}
- public void getPSClosedLoopDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getPSClosedLoopDictionary(HttpServletRequest request, HttpServletResponse response){
PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
dictionary.getPSClosedLoopEntityData(request, response);
}
- public void getPSGroupScopeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getPSGroupScopeDictionary(HttpServletRequest request, HttpServletResponse response){
PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
dictionary.getGroupPolicyScopeEntityData(request, response);
}
- public void getRiskTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getRiskTypeDictionary(HttpServletRequest request, HttpServletResponse response){
SafePolicyController dictionary = new SafePolicyController();
dictionary.getOnapNameDictionaryEntityData(request, response);
}
- public void getSafePolicyWarningDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+ public void getSafePolicyWarningDictionary(HttpServletRequest request, HttpServletResponse response) {
SafePolicyController dictionary = new SafePolicyController();
dictionary.getSafePolicyWarningeEntityData(request, response);
}
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/ImportService.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/ImportService.java
index 166720714..8a9e8ffac 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/ImportService.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/ImportService.java
@@ -38,7 +38,6 @@ import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.Logger;
import org.onap.policy.pap.xacml.rest.components.CreateBRMSRuleTemplate;
import org.onap.policy.pap.xacml.rest.components.CreateNewMicroServiceModel;
-import org.onap.policy.pap.xacml.rest.model.PDPPolicyContainer;
public class ImportService {
private static final Logger logger = FlexLogger.getLogger(ImportService.class);
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/JPAUtils.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/JPAUtils.java
index 05885ee16..e18ca9ebd 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/JPAUtils.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/JPAUtils.java
@@ -43,7 +43,7 @@ import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.Logger;
public class JPAUtils {
- private static Logger LOGGER = FlexLogger.getLogger(JPAUtils.class);
+ private static final Logger LOGGER = FlexLogger.getLogger(JPAUtils.class);
private static EntityManagerFactory emf;
private static final Object mapAccess = new Object();
@@ -73,7 +73,7 @@ public class JPAUtils {
private JPAUtils(EntityManagerFactory emf){
LOGGER.debug("JPAUtils(EntityManagerFactory emf) as JPAUtils("+emf+") called");
- this.emf = emf;
+ JPAUtils.emf = emf;
}
/**
@@ -169,7 +169,7 @@ public class JPAUtils {
for (Object id : functionList) {
FunctionDefinition value = (FunctionDefinition)id;
mapID2Function.put(value.getXacmlid(), value);
- if (mapDatatype2Function.containsKey(value.getDatatypeBean()) == false) {
+ if (!mapDatatype2Function.containsKey(value.getDatatypeBean())) {
mapDatatype2Function.put(value.getDatatypeBean(), new ArrayList<FunctionDefinition>());
}
mapDatatype2Function.get(value.getDatatypeBean()).add(value);