Consolidate PolicyRestAdapter setup

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

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 90f8b5a..8a7c604 100644 (file)
--- 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
@@ -21,12 +21,15 @@
 package org.onap.policy.pap.xacml.rest.handler;
 
 import com.att.research.xacml.util.XACMLProperties;
 package org.onap.policy.pap.xacml.rest.handler;
 
 import com.att.research.xacml.util.XACMLProperties;

+

 import java.io.IOException;
 import java.util.HashMap;
 import java.io.IOException;
 import java.util.HashMap;

+

 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.parsers.ParserConfigurationException;
 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.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;


@@ -45,11 +48,11 @@ public class SavePolicyHandler {
         String policyType = request.getParameter("policyType");
         String apiflag = request.getParameter("apiflag");
         PolicyCreation creation = new PolicyCreation();
         String policyType = request.getParameter("policyType");
         String apiflag = request.getParameter("apiflag");
         PolicyCreation creation = new PolicyCreation();

-        if ( policyType != null ) {
+        if (policyType != null) {

             PolicyRestAdapter policyAdapter = new PolicyRestAdapter();
             PolicyRestAdapter policyAdapter = new PolicyRestAdapter();

-            if("update".equalsIgnoreCase(operation)){
+            if ("update".equalsIgnoreCase(operation)) {

                 policyAdapter.setEditPolicy(true);
                 policyAdapter.setEditPolicy(true);

-            }else{
+            } else {

                 policyAdapter.setEditPolicy(false);
             }
 
                 policyAdapter.setEditPolicy(false);
             }
 


@@ -58,10 +61,10 @@ public class SavePolicyHandler {
             // read the inputStream into a buffer (trick found online scans entire input looking for end-of-file)
             java.util.Scanner scanner = new java.util.Scanner(request.getInputStream());
             scanner.useDelimiter("\\A");
             // read the inputStream into a buffer (trick found online scans entire input looking for end-of-file)
             java.util.Scanner scanner = new java.util.Scanner(request.getInputStream());
             scanner.useDelimiter("\\A");

-            json =  scanner.hasNext() ? scanner.next() : "";
+            json = scanner.hasNext() ? scanner.next() : "";

             scanner.close();
 
             scanner.close();
 

-            if(policyAdapter.isEditPolicy()){
+            if (policyAdapter.isEditPolicy()) {

                 PolicyLogger.info("SavePolicyHandler: JSON request from API to update a policy: " + json);
             } else {
                 PolicyLogger.info("SavePolicyHandler: JSON request from API to create a policy: " + json);
                 PolicyLogger.info("SavePolicyHandler: JSON request from API to update a policy: " + json);
             } else {
                 PolicyLogger.info("SavePolicyHandler: JSON request from API to create a policy: " + json);


@@ -69,67 +72,68 @@ public class SavePolicyHandler {
 
             // convert Object sent as JSON into local object
             StdPAPPolicy policy = PolicyUtils.jsonStringToObject(json, StdPAPPolicy.class);
 
             // convert Object sent as JSON into local object
             StdPAPPolicy policy = PolicyUtils.jsonStringToObject(json, StdPAPPolicy.class);

-            //Set policyAdapter values including parentPath (Common to all policy types)
+            // Set policyAdapter values including parentPath (Common to all policy types)

             try {
                 PolicyLogger.info("SavePolicyHandler: Setting parameter values to PolicyAdapter");
                 policyAdapter = setDataToPolicyAdapter(policy, policyType, apiflag);
 
             try {
                 PolicyLogger.info("SavePolicyHandler: Setting parameter values to PolicyAdapter");
                 policyAdapter = setDataToPolicyAdapter(policy, policyType, apiflag);
 

-                if(!extendedPolicyOptions(policyAdapter, response)){
+                if (!extendedPolicyOptions(policyAdapter, response)) {

                     creation.savePolicy(policyAdapter, response);
                 }
                 if ("update".equalsIgnoreCase(operation)) {
                     creation.savePolicy(policyAdapter, response);
                 }
                 if ("update".equalsIgnoreCase(operation)) {

-                    response.addHeader("operation",  "update");
+                    response.addHeader("operation", "update");

                 } else {
                     response.addHeader("operation", "create");
                 }
             } catch (Exception e1) {
                 } else {
                     response.addHeader("operation", "create");
                 }
             } catch (Exception e1) {

-                logger.error("Could not set data to policy adapter "+e1.getMessage(),e1);
+                logger.error("Could not set data to policy adapter " + e1.getMessage(), e1);

             }
         }
     }
 
             }
         }
     }
 

-    private PolicyRestAdapter setDataToPolicyAdapter(StdPAPPolicy policy, String policyType, String apiflag) throws ParserConfigurationException, ServletException, SAXException, IOException{
+    private PolicyRestAdapter setDataToPolicyAdapter(StdPAPPolicy policy, String policyType, String apiflag)
+            throws ParserConfigurationException, ServletException, SAXException, IOException {

         PolicyRestAdapter policyAdapter = new PolicyRestAdapter();
         policyAdapter.setApiflag(apiflag);
         /*
          * set policy adapter values for Building JSON object containing policy data
          */
         PolicyRestAdapter policyAdapter = new PolicyRestAdapter();
         policyAdapter.setApiflag(apiflag);
         /*
          * set policy adapter values for Building JSON object containing policy data
          */

-        //Common among policy types
+        // Common among policy types

         policyAdapter.setPolicyName(policy.getPolicyName());
         policyAdapter.setPolicyDescription(policy.getPolicyDescription());
         policyAdapter.setPolicyName(policy.getPolicyName());
         policyAdapter.setPolicyDescription(policy.getPolicyDescription());

-        policyAdapter.setOnapName(policy.getOnapName()); //Config Base and Decision Policies
+        policyAdapter.setOnapName(policy.getOnapName()); // Config Base and Decision Policies

         policyAdapter.setRuleCombiningAlgId("urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides");
 
         policyAdapter.setPolicyType(policyType);
         policyAdapter.setDynamicFieldConfigAttributes(policy.getDynamicFieldConfigAttributes());
         policyAdapter.setEditPolicy(policy.isEditPolicy());
         policyAdapter.setRuleCombiningAlgId("urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides");
 
         policyAdapter.setPolicyType(policyType);
         policyAdapter.setDynamicFieldConfigAttributes(policy.getDynamicFieldConfigAttributes());
         policyAdapter.setEditPolicy(policy.isEditPolicy());

-        //Config Specific
-        policyAdapter.setConfigName(policy.getConfigName());  //Base and Firewall
-        policyAdapter.setConfigBodyData(policy.getConfigBodyData()); //Base
-        policyAdapter.setConfigType((policy.getConfigType()!=null) ? policy.getConfigType().toUpperCase(): null);  //Base
-        policyAdapter.setJsonBody(policy.getJsonBody()); //Firewall, ClosedLoop
+        // Config Specific
+        policyAdapter.setConfigName(policy.getConfigName()); // Base and Firewall
+        policyAdapter.setConfigBodyData(policy.getConfigBodyData()); // Base
+        policyAdapter.setConfigType((policy.getConfigType() != null) ? policy.getConfigType().toUpperCase() : null); // Base
+        policyAdapter.setJsonBody(policy.getJsonBody()); // Firewall, ClosedLoop

         policyAdapter.setConfigPolicyType(policy.getConfigPolicyType());
         policyAdapter.setConfigPolicyType(policy.getConfigPolicyType());

-        policyAdapter.setDraft(policy.isDraft()); //ClosedLoop_Fault
-        policyAdapter.setServiceType(policy.getServiceType()); //ClosedLoop_PM
-        policyAdapter.setUuid(policy.getUuid()); //Micro Service
-        policyAdapter.setLocation(policy.getMsLocation()); //Micro Service
-        policyAdapter.setPriority(policy.getPriority()); //Micro Service
+        policyAdapter.setDraft(policy.isDraft()); // ClosedLoop_Fault
+        policyAdapter.setServiceType(policy.getServiceType()); // ClosedLoop_PM
+        policyAdapter.setUuid(policy.getUuid()); // Micro Service
+        policyAdapter.setLocation(policy.getMsLocation()); // Micro Service
+        policyAdapter.setPriority(policy.getPriority()); // Micro Service

         policyAdapter.setPolicyScope(policy.getDomainDir());
         policyAdapter.setPolicyScope(policy.getDomainDir());

-        policyAdapter.setRiskType(policy.getRiskType()); //Safe Policy Attributes
-        policyAdapter.setRiskLevel(policy.getRiskLevel());//Safe Policy Attributes
-        policyAdapter.setGuard(policy.getGuard());//Safe Policy Attributes
-        policyAdapter.setTtlDate(policy.getTTLDate());//Safe Policy Attributes
+        policyAdapter.setRiskType(policy.getRiskType()); // Safe Policy Attributes
+        policyAdapter.setRiskLevel(policy.getRiskLevel());// Safe Policy Attributes
+        policyAdapter.setGuard(policy.getGuard());// Safe Policy Attributes
+        policyAdapter.setTtlDate(policy.getTTLDate());// Safe Policy Attributes

         policyAdapter.setBrmsParamBody(policy.getDrlRuleAndUIParams());
         policyAdapter.setBrmsDependency(policy.getBrmsDependency()); // BRMS Policies.
         policyAdapter.setBrmsController(policy.getBrmsController()); // BRMS Policies.
         policyAdapter.setBrmsParamBody(policy.getDrlRuleAndUIParams());
         policyAdapter.setBrmsDependency(policy.getBrmsDependency()); // BRMS Policies.
         policyAdapter.setBrmsController(policy.getBrmsController()); // BRMS Policies.

-        //Action Policy Specific
-        policyAdapter.setActionAttribute(policy.getActionAttribute());  //comboDictValue
+        // Action Policy Specific
+        policyAdapter.setActionAttribute(policy.getActionAttribute()); // comboDictValue

         policyAdapter.setActionPerformer(policy.getActionPerformer());
         policyAdapter.setDynamicRuleAlgorithmLabels(policy.getDynamicRuleAlgorithmLabels());
         policyAdapter.setDynamicRuleAlgorithmCombo(policy.getDynamicRuleAlgorithmCombo());
         policyAdapter.setDynamicRuleAlgorithmField1(policy.getDynamicRuleAlgorithmField1());
         policyAdapter.setDynamicRuleAlgorithmField2(policy.getDynamicRuleAlgorithmField2());
         policyAdapter.setActionPerformer(policy.getActionPerformer());
         policyAdapter.setDynamicRuleAlgorithmLabels(policy.getDynamicRuleAlgorithmLabels());
         policyAdapter.setDynamicRuleAlgorithmCombo(policy.getDynamicRuleAlgorithmCombo());
         policyAdapter.setDynamicRuleAlgorithmField1(policy.getDynamicRuleAlgorithmField1());
         policyAdapter.setDynamicRuleAlgorithmField2(policy.getDynamicRuleAlgorithmField2());

-        //Decision Policy Specific
+        // Decision Policy Specific

         policyAdapter.setDynamicSettingsMap(policy.getDynamicSettingsMap());
         policyAdapter.setRuleProvider(policy.getProviderComboBox());
         policyAdapter.setDomainDir(policyAdapter.getPolicyScope());
         policyAdapter.setDynamicSettingsMap(policy.getDynamicSettingsMap());
         policyAdapter.setRuleProvider(policy.getProviderComboBox());
         policyAdapter.setDomainDir(policyAdapter.getPolicyScope());


@@ -139,24 +143,25 @@ public class SavePolicyHandler {
         return policyAdapter;
     }
 
         return policyAdapter;
     }
 

-    public boolean extendedPolicyOptions(PolicyRestAdapter policyAdapter, HttpServletResponse response){
+    public boolean extendedPolicyOptions(PolicyRestAdapter policyAdapter, HttpServletResponse response) {

         return false;
     }
 
         return false;
     }
 

-    public void addErrorHeader(String key, String value){
-        if(ErrorHeaders==null){
-            ErrorHeaders= new HashMap<>();
+    public void addErrorHeader(String key, String value) {
+        if (ErrorHeaders == null) {
+            ErrorHeaders = new HashMap<>();

         }
         ErrorHeaders.put(key, value);
     }
 
     public static SavePolicyHandler getInstance() {
         try {
         }
         ErrorHeaders.put(key, value);
     }
 
     public static SavePolicyHandler getInstance() {
         try {

-            Class<?> savePolicyHandler = Class.forName(XACMLProperties.getProperty("savePolicy.impl.className", SavePolicyHandler.class.getName()));
+            Class<?> savePolicyHandler = Class.forName(
+                    XACMLProperties.getProperty("savePolicy.impl.className", SavePolicyHandler.class.getName()));

             SavePolicyHandler instance = (SavePolicyHandler) savePolicyHandler.newInstance();
             return instance;
         } catch (Exception e) {
             SavePolicyHandler instance = (SavePolicyHandler) savePolicyHandler.newInstance();
             return instance;
         } catch (Exception e) {

-            logger.error(e.getMessage(),e);
+            logger.error(e.getMessage(), e);

         }
         return null;
     }
         }
         return null;
     }