Fixes for missed sonar critical issues

[policy/engine.git] / ONAP-PAP-REST / src / main / java / org / onap / policy / pap / xacml / rest / handler / DeleteHandler.java

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 17fd2c1..ab04923 100644 (file)
--- 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
@@ -36,6 +36,8 @@ import javax.servlet.http.HttpServletResponse;
 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;
@@ -58,13 +60,9 @@ import com.att.research.xacml.util.XACMLProperties;
 public class DeleteHandler {
 
        private OnapPDPGroup newgroup;
-       
-       private static String papDbDriver = null;
-       private static String papDbUrl = null;
-       private static String papDbUser = null;
-       private static String papDbPassword = null;
+       private static Logger logger = FlexLogger.getLogger(DeleteHandler.class);
 
-       public void doAPIDeleteFromPAP(HttpServletRequest request, HttpServletResponse response, ONAPLoggingContext loggingContext) throws Exception {
+       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());
@@ -85,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 {
@@ -107,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")){
@@ -188,6 +186,7 @@ public class DeleteHandler {
                                                                policyVersionDeleted = true;
                                                                em.remove(pVersion);
                                                        }catch(Exception e){
+                                                               logger.error(e.getMessage(),e);
                                                                policyVersionDeleted = false;
                                                        }
                                                }
@@ -228,6 +227,7 @@ public class DeleteHandler {
                                                                        policyVersionDeleted = true;
                                                                        em.persist(pVersion);
                                                                }catch(Exception e){
+                                                                       logger.error(e.getMessage(),e);
                                                                        policyVersionDeleted = false;
                                                                }
                                                        }else{
@@ -235,6 +235,7 @@ public class DeleteHandler {
                                                                        policyVersionDeleted = true;
                                                                        em.remove(pVersion);
                                                                }catch(Exception e){
+                                                                       logger.error(e.getMessage(),e);
                                                                        policyVersionDeleted = false;
                                                                }
                                                        }
@@ -274,7 +275,7 @@ public class DeleteHandler {
                }
        }
        
-       public 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();
@@ -289,12 +290,13 @@ public class DeleteHandler {
                        controller.deleteElk(policyData);
                        em.remove(policyEntity);
                }catch(Exception e){
+                       logger.error(e.getMessage(),e);
                        return "error";
                }
                return "success";
        }
        
-       public boolean checkPolicyGroupEntity(EntityManager em, Connection con, List<?> peResult) throws SQLException{
+       public static boolean checkPolicyGroupEntity(EntityManager em, Connection con, List<?> peResult) throws SQLException{
                for(Object peData : peResult){
                        PolicyEntity policyEntity = (PolicyEntity) peData;
                        Statement st = null;
@@ -466,10 +468,9 @@ 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) {
-                       PolicyLogger.error(e.getMessage());
+                       logger.error(e.getMessage(),e);
                }
                return null;
        }