X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fadmin%2FPolicyAdapter.java;h=339702297c89d47582fce7ee06e74825e3a14de6;hp=be660c8036700cc7635bf66d562220e0fd13bf3b;hb=dfd9c0a09c35e4b5b4b61be08b8424e4a3d0d500;hpb=87ef46b7f3004e78b89c5a5c60d1160b332abbb2

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyAdapter.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyAdapter.java
index be660c803..339702297 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyAdapter.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyAdapter.java
@@ -2,8 +2,9 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
  * Modified Copyright (C) 2018 Samsung Electronics Co., Ltd.
+ * Modifications Copyright (C) 2019 Bell Canada
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +22,8 @@
 
 package org.onap.policy.admin;
 
+import com.att.research.xacml.util.XACMLProperties;
+
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.controller.ActionPolicyController;
@@ -36,11 +39,9 @@ import org.onap.policy.controller.DecisionPolicyController;
 import org.onap.policy.rest.adapter.PolicyRestAdapter;
 import org.onap.policy.rest.jpa.PolicyEntity;
 
-import com.att.research.xacml.util.XACMLProperties;
-
 public class PolicyAdapter {
 
-    private static final Logger LOGGER	= FlexLogger.getLogger(PolicyAdapter.class);
+    private static final Logger LOGGER = FlexLogger.getLogger(PolicyAdapter.class);
 
     public void configure(PolicyRestAdapter policyAdapter, PolicyEntity entity) {
         String policyNameValue = policyAdapter.getPolicyName().substring(0, policyAdapter.getPolicyName().indexOf('_'));
@@ -50,77 +51,71 @@ public class PolicyAdapter {
         if (configPolicyName != null) {
             policyAdapter.setConfigPolicyType(configPolicyName);
         }
-
-        if("Action".equalsIgnoreCase(policyAdapter.getPolicyType())){
-            new ActionPolicyController().prePopulateActionPolicyData(policyAdapter, entity);
+        if ("Action".equalsIgnoreCase(policyAdapter.getPolicyType())) {
+            new ActionPolicyController().prePopulateActionPolicyData(policyAdapter);
         }
-        if("Decision".equalsIgnoreCase(policyAdapter.getPolicyType())){
+        if ("Decision".equalsIgnoreCase(policyAdapter.getPolicyType())) {
             new DecisionPolicyController().prePopulateDecisionPolicyData(policyAdapter, entity);
         }
-        if("Config".equalsIgnoreCase(policyAdapter.getPolicyType())){
+        if ("Config".equalsIgnoreCase(policyAdapter.getPolicyType())) {
             prePopulatePolicyData(policyAdapter, entity);
         }
     }
 
     private String getConfigPolicyName(PolicyRestAdapter policyAdapter) {
-        String	configPolicyName = null ;
-        if(policyAdapter.getPolicyName().startsWith("Config_PM")){
+        String configPolicyName = null;
+        if (policyAdapter.getPolicyName().startsWith("Config_PM")) {
             configPolicyName = "ClosedLoop_PM";
-        }else if(policyAdapter.getPolicyName().startsWith("Config_Fault")){
+        } else if (policyAdapter.getPolicyName().startsWith("Config_Fault")) {
             configPolicyName = "ClosedLoop_Fault";
-        }else if(policyAdapter.getPolicyName().startsWith("Config_FW")){
+        } else if (policyAdapter.getPolicyName().startsWith("Config_FW")) {
             configPolicyName = "Firewall Config";
-        }else if(policyAdapter.getPolicyName().startsWith("Config_BRMS_Raw")){
+        } else if (policyAdapter.getPolicyName().startsWith("Config_BRMS_Raw")) {
             configPolicyName = "BRMS_Raw";
-        }else if(policyAdapter.getPolicyName().startsWith("Config_BRMS_Param")){
+        } else if (policyAdapter.getPolicyName().startsWith("Config_BRMS_Param")) {
             configPolicyName = "BRMS_Param";
-        }else if(policyAdapter.getPolicyName().startsWith("Config_MS")){
+        } else if (policyAdapter.getPolicyName().startsWith("Config_MS")) {
             configPolicyName = "Micro Service";
-        }else if(policyAdapter.getPolicyName().startsWith("Config_OOF")){
+        } else if (policyAdapter.getPolicyName().startsWith("Config_OOF")) {
             configPolicyName = "Optimization";
-        }else if(policyAdapter.getPolicyName().startsWith("Action") || policyAdapter.getPolicyName().startsWith("Decision") ){
+        } else if (policyAdapter.getPolicyName().startsWith("Action")
+                || policyAdapter.getPolicyName().startsWith("Decision")) {
             // No configPolicyName is applicable
-        }else{
+        } else {
             configPolicyName = "Base";
         }
         return configPolicyName;
     }
 
     private void prePopulatePolicyData(PolicyRestAdapter policyAdapter, PolicyEntity entity) {
-        if("Base".equalsIgnoreCase(policyAdapter.getConfigPolicyType())){
+        if ("Base".equalsIgnoreCase(policyAdapter.getConfigPolicyType())) {
             new CreatePolicyController().prePopulateBaseConfigPolicyData(policyAdapter, entity);
-        }
-        else if("BRMS_Raw".equalsIgnoreCase(policyAdapter.getConfigPolicyType())){
+        } else if ("BRMS_Raw".equalsIgnoreCase(policyAdapter.getConfigPolicyType())) {
             new CreateBRMSRawController().prePopulateBRMSRawPolicyData(policyAdapter, entity);
-        }
-        else if("BRMS_Param".equalsIgnoreCase(policyAdapter.getConfigPolicyType())){
+        } else if ("BRMS_Param".equalsIgnoreCase(policyAdapter.getConfigPolicyType())) {
             new CreateBRMSParamController().prePopulateBRMSParamPolicyData(policyAdapter, entity);
-        }
-        else if("ClosedLoop_Fault".equalsIgnoreCase(policyAdapter.getConfigPolicyType())){
+        } else if ("ClosedLoop_Fault".equalsIgnoreCase(policyAdapter.getConfigPolicyType())) {
             new CreateClosedLoopFaultController().prePopulateClosedLoopFaultPolicyData(policyAdapter, entity);
-        }
-        else if("ClosedLoop_PM".equalsIgnoreCase(policyAdapter.getConfigPolicyType())){
+        } else if ("ClosedLoop_PM".equalsIgnoreCase(policyAdapter.getConfigPolicyType())) {
             new CreateClosedLoopPMController().prePopulateClosedLoopPMPolicyData(policyAdapter, entity);
-        }
-        else if("Micro Service".equalsIgnoreCase(policyAdapter.getConfigPolicyType())){
+        } else if ("Micro Service".equalsIgnoreCase(policyAdapter.getConfigPolicyType())) {
             new CreateDcaeMicroServiceController().prePopulateDCAEMSPolicyData(policyAdapter, entity);
-        }
-        else if("Optimization".equalsIgnoreCase(policyAdapter.getConfigPolicyType())){
+        } else if ("Optimization".equalsIgnoreCase(policyAdapter.getConfigPolicyType())) {
             new CreateOptimizationController().prePopulatePolicyData(policyAdapter, entity);
-        }
-        else if("Firewall Config".equalsIgnoreCase(policyAdapter.getConfigPolicyType())){
+        } else if ("Firewall Config".equalsIgnoreCase(policyAdapter.getConfigPolicyType())) {
             new CreateFirewallController().prePopulateFWPolicyData(policyAdapter, entity);
         }
     }
 
     public static PolicyAdapter getInstance() {
         try {
-            Class<?> policyAdapter = Class.forName(XACMLProperties.getProperty("policyAdapter.impl.className", PolicyAdapter.class.getName()));
+            Class<?> policyAdapter = Class.forName(
+                    XACMLProperties.getProperty("policyAdapter.impl.className", PolicyAdapter.class.getName()));
             return (PolicyAdapter) policyAdapter.newInstance();
-        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | IllegalArgumentException e) {
-            LOGGER.error("Exception Occured"+e);
+        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException
+                | IllegalArgumentException e) {
+            LOGGER.error("Exception Occurred" + e);
         }
         return null;
     }
-
-}
\ No newline at end of file
+}