X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fadmin%2FPolicyAdapter.java;h=42010f14763c854021f9bfd282102ab964538154;hb=3ee17bad27b036a9e4ca6e50a7fbdfe2ed0a8e7f;hp=545143a22631c2c4af18bcba37ec06a3779e6f53;hpb=b65e96826d7339ce29ddb73e3ed6775bd4f54753;p=policy%2Fengine.git

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 545143a22..42010f147 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
@@ -41,33 +41,26 @@ public class PolicyAdapter {
 	private static final Logger LOGGER	= FlexLogger.getLogger(PolicyAdapter.class);
 	
 	public void configure(PolicyRestAdapter policyAdapter, PolicyEntity entity) {
-		String	policyNameValue;
-		String	configPolicyName = null ;
 		if(extendedOptions(policyAdapter, entity)){
 			return;
 		}
+		String policyNameValue = policyAdapter.getPolicyName().substring(0, policyAdapter.getPolicyName().indexOf('_'));
+		String	configPolicyName = null ;
 		if(policyAdapter.getPolicyName().startsWith("Config_PM")){
-			policyNameValue = policyAdapter.getPolicyName().substring(0, policyAdapter.getPolicyName().indexOf('_'));
 			configPolicyName = "ClosedLoop_PM";
 		}else if(policyAdapter.getPolicyName().startsWith("Config_Fault")){
-			policyNameValue = policyAdapter.getPolicyName().substring(0, policyAdapter.getPolicyName().indexOf('_'));
 			configPolicyName = "ClosedLoop_Fault";
 		}else if(policyAdapter.getPolicyName().startsWith("Config_FW")){
-			policyNameValue = policyAdapter.getPolicyName().substring(0, policyAdapter.getPolicyName().indexOf('_'));
 			configPolicyName = "Firewall Config";
 		}else if(policyAdapter.getPolicyName().startsWith("Config_BRMS_Raw")){
-			policyNameValue = policyAdapter.getPolicyName().substring(0, policyAdapter.getPolicyName().indexOf('_'));
 			configPolicyName = "BRMS_Raw";
 		}else if(policyAdapter.getPolicyName().startsWith("Config_BRMS_Param")){
-			policyNameValue = policyAdapter.getPolicyName().substring(0, policyAdapter.getPolicyName().indexOf('_'));
 			configPolicyName = "BRMS_Param";
 		}else if(policyAdapter.getPolicyName().startsWith("Config_MS")){
-			policyNameValue = policyAdapter.getPolicyName().substring(0, policyAdapter.getPolicyName().indexOf('_'));
 			configPolicyName = "Micro Service";
 		}else if(policyAdapter.getPolicyName().startsWith("Action") || policyAdapter.getPolicyName().startsWith("Decision") ){
-			policyNameValue = policyAdapter.getPolicyName().substring(0, policyAdapter.getPolicyName().indexOf('_'));
+			// No configPolicyName is applicable
 		}else{
-			policyNameValue = policyAdapter.getPolicyName().substring(0, policyAdapter.getPolicyName().indexOf('_'));
 			configPolicyName = "Base";
 		}
 		if (policyNameValue != null) {
@@ -78,41 +71,32 @@ public class PolicyAdapter {
 		}
 
 		if("Action".equalsIgnoreCase(policyAdapter.getPolicyType())){
-			ActionPolicyController actionController = new ActionPolicyController();
-			actionController.prePopulateActionPolicyData(policyAdapter, entity);
+			new ActionPolicyController().prePopulateActionPolicyData(policyAdapter, entity);
 		}
 		if("Decision".equalsIgnoreCase(policyAdapter.getPolicyType())){
-			DecisionPolicyController decisionController = new DecisionPolicyController();
-			decisionController.prePopulateDecisionPolicyData(policyAdapter, entity);
+			new DecisionPolicyController().prePopulateDecisionPolicyData(policyAdapter, entity);
 		}
 		if("Config".equalsIgnoreCase(policyAdapter.getPolicyType())){
 			if("Base".equalsIgnoreCase(policyAdapter.getConfigPolicyType())){
-				CreatePolicyController baseController = new CreatePolicyController();
-				baseController.prePopulateBaseConfigPolicyData(policyAdapter, entity);
+				new CreatePolicyController().prePopulateBaseConfigPolicyData(policyAdapter, entity);
 			}
 			else if("BRMS_Raw".equalsIgnoreCase(policyAdapter.getConfigPolicyType())){
-				CreateBRMSRawController brmsController = new CreateBRMSRawController();
-				brmsController.prePopulateBRMSRawPolicyData(policyAdapter, entity);
+				new CreateBRMSRawController().prePopulateBRMSRawPolicyData(policyAdapter, entity);
 			}
 			else if("BRMS_Param".equalsIgnoreCase(policyAdapter.getConfigPolicyType())){
-				CreateBRMSParamController paramController = new CreateBRMSParamController();
-				paramController.prePopulateBRMSParamPolicyData(policyAdapter, entity);
+				new CreateBRMSParamController().prePopulateBRMSParamPolicyData(policyAdapter, entity);
 			}
 			else if("ClosedLoop_Fault".equalsIgnoreCase(policyAdapter.getConfigPolicyType())){
-				CreateClosedLoopFaultController newFaultTemplate =  new CreateClosedLoopFaultController();
-				newFaultTemplate.prePopulateClosedLoopFaultPolicyData(policyAdapter, entity);
+				new CreateClosedLoopFaultController().prePopulateClosedLoopFaultPolicyData(policyAdapter, entity);
 			}
 			else if("ClosedLoop_PM".equalsIgnoreCase(policyAdapter.getConfigPolicyType())){
-				CreateClosedLoopPMController pmController = new CreateClosedLoopPMController();
-				pmController.prePopulateClosedLoopPMPolicyData(policyAdapter, entity);
+				new CreateClosedLoopPMController().prePopulateClosedLoopPMPolicyData(policyAdapter, entity);
 			}
 			else if("Micro Service".equalsIgnoreCase(policyAdapter.getConfigPolicyType())){
-				CreateDcaeMicroServiceController msController = new CreateDcaeMicroServiceController();
-				msController.prePopulateDCAEMSPolicyData(policyAdapter, entity);
+				new CreateDcaeMicroServiceController().prePopulateDCAEMSPolicyData(policyAdapter, entity);
 			}
 			else if("Firewall Config".equalsIgnoreCase(policyAdapter.getConfigPolicyType())){
-				CreateFirewallController firewallController = new CreateFirewallController();
-				firewallController.prePopulateFWPolicyData(policyAdapter, entity);
+				new CreateFirewallController().prePopulateFWPolicyData(policyAdapter, entity);
 			}
 		}
 	}
@@ -130,7 +114,5 @@ public class PolicyAdapter {
 		}
 		return null;
 	}
-	
-	
 
 }