X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fpolicycontroller%2FPolicyCreation.java;h=f7ef1a097eb452a4d2450183b225b25619a25377;hb=b6d9063e06ab8cdf2d97fc75810792659344e4a8;hp=415c7792d6632a493a5ca867f1132cc14e25bfc2;hpb=0c8425b25c093f638351a14f84a7b1df731cd0de;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
index 415c7792d..f7ef1a097 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
@@ -44,6 +44,7 @@ import org.onap.policy.pap.xacml.rest.components.CreateClosedLoopPerformanceMetr
 import org.onap.policy.pap.xacml.rest.components.DecisionPolicy;
 import org.onap.policy.pap.xacml.rest.components.FirewallConfigPolicy;
 import org.onap.policy.pap.xacml.rest.components.MicroServiceConfigPolicy;
+import org.onap.policy.pap.xacml.rest.components.OptimizationConfigPolicy;
 import org.onap.policy.pap.xacml.rest.components.Policy;
 import org.onap.policy.pap.xacml.rest.components.PolicyDBDao;
 import org.onap.policy.pap.xacml.rest.components.PolicyDBDaoTransaction;
@@ -123,33 +124,35 @@ public class PolicyCreation extends AbstractPolicyCreation{
 			String policyType = policyData.getPolicyType();
 
 			String filePrefix = null;
-			if (policyType.equalsIgnoreCase("Config")) {
+			if ("Config".equalsIgnoreCase(policyType)) {
 				policyConfigType = policyData.getConfigPolicyType();
-				if (policyConfigType.equalsIgnoreCase("Firewall Config")) {
+				if ("Firewall Config".equalsIgnoreCase(policyConfigType)) {
 					filePrefix = "Config_FW_";
-				}else if (policyConfigType.equalsIgnoreCase("ClosedLoop_Fault")) {
+				}else if ("ClosedLoop_Fault".equalsIgnoreCase(policyConfigType)) {
 					filePrefix = "Config_Fault_";
-				}else if (policyConfigType.equalsIgnoreCase("ClosedLoop_PM")) {
+				}else if ("ClosedLoop_PM".equalsIgnoreCase(policyConfigType)) {
 					filePrefix = "Config_PM_";
-				}else if (policyConfigType.equalsIgnoreCase("Micro Service")) {
+				}else if ("Micro Service".equalsIgnoreCase(policyConfigType)) {
 					filePrefix = "Config_MS_";
-				}else if (policyConfigType.equalsIgnoreCase("BRMS_Raw")) {
+				}else if ("Optimization".equalsIgnoreCase(policyConfigType)) {
+					filePrefix = "Config_OOF_";
+				}else if ("BRMS_Raw".equalsIgnoreCase(policyConfigType)) {
 					filePrefix = "Config_BRMS_Raw_";
-				}else if (policyConfigType.equalsIgnoreCase("BRMS_Param")) {
+				}else if ("BRMS_Param".equalsIgnoreCase(policyConfigType)) {
 					filePrefix = "Config_BRMS_Param_";
 				}else {
 					filePrefix = "Config_"; 
 				}
-			} else if (policyType.equalsIgnoreCase("Action")) {
+			} else if ("Action".equalsIgnoreCase(policyType)) {
 				filePrefix = "Action_";
-			} else if (policyType.equalsIgnoreCase("Decision")) {
+			} else if ("Decision".equalsIgnoreCase(policyType)) {
 				filePrefix = "Decision_";
 			}
 
 			int version = 0;
 			int highestVersion = 0;
-			String createdBy = "";
-			String modifiedBy = userId;
+			String createdBy;
+			String modifiedBy;
 			String scopeCheck = policyData.getDomainDir().replace(".", File.separator);
 			PolicyEditorScopes policyEditorScope = (PolicyEditorScopes) commonClassDao.getEntityItem(PolicyEditorScopes.class, "scopeName", scopeCheck);
 			if(policyEditorScope == null){
@@ -192,7 +195,7 @@ public class PolicyCreation extends AbstractPolicyCreation{
 					response.setStatus(HttpServletResponse.SC_CONFLICT);
 					response.addHeader("error", "policyExists");
 					response.addHeader("policyName", policyData.getPolicyName());
-					return new ResponseEntity<String>(body, status);
+					return new ResponseEntity<>(body, status);
 				}		
 			}else{
 				// if policy does not exist and the request is updatePolicy return error
@@ -247,21 +250,21 @@ public class PolicyCreation extends AbstractPolicyCreation{
 			policyData.setHighestVersion(version);
 
 			// Calling Component class per policy type
-			if (policyType.equalsIgnoreCase("Config")) {
-				if (policyConfigType.equalsIgnoreCase("Firewall Config")) {
+			if ("Config".equalsIgnoreCase(policyType)) {
+				if ("Firewall Config".equalsIgnoreCase(policyConfigType)) {
 					newPolicy = new FirewallConfigPolicy(policyData);
-				}else if (policyConfigType.equalsIgnoreCase("BRMS_Raw")) { 
+				}else if ("BRMS_Raw".equalsIgnoreCase(policyConfigType)) { 
 					policyData.setOnapName("DROOLS");
 					policyData.setConfigName("BRMS_RAW_RULE");
 					newPolicy = new CreateBrmsRawPolicy(policyData);
-				}else if (policyConfigType.equalsIgnoreCase("BRMS_Param")) {
+				}else if ("BRMS_Param".equalsIgnoreCase(policyConfigType)) {
 					policyData.setOnapName("DROOLS");
 					policyData.setConfigName("BRMS_PARAM_RULE");
 					Map<String, String> drlRuleAndUIParams = new HashMap<>();
 					if(policyData.getApiflag() == null){
 						// If there is any dynamic field create the matches here
 						String key="templateName";
-						String value=(String) policyData.getRuleName();
+						String value= policyData.getRuleName();
 						drlRuleAndUIParams.put(key, value);
 						if(policyData.getRuleData().size() > 0){
 							for(Object keyValue: policyData.getRuleData().keySet()){
@@ -287,11 +290,11 @@ public class PolicyCreation extends AbstractPolicyCreation{
 		                }
 					}		
 					newPolicy = new CreateBrmsParamPolicy(policyData);
-				}else if (policyConfigType.equalsIgnoreCase("Base")) {
+				}else if ("Base".equalsIgnoreCase(policyConfigType)) {
 					newPolicy =  new ConfigPolicy(policyData);
-				}else if (policyConfigType.equalsIgnoreCase("ClosedLoop_Fault")) {
+				}else if ("ClosedLoop_Fault".equalsIgnoreCase(policyConfigType)) {
 					newPolicy = new ClosedLoopPolicy(policyData);
-				}else if (policyConfigType.equalsIgnoreCase("ClosedLoop_PM")) {
+				}else if ("ClosedLoop_PM".equalsIgnoreCase(policyConfigType)) {
 					if(policyData.getApiflag() == null){
 						policyData.setServiceType(policyData.getServiceTypePolicyName().get("serviceTypePolicyName").toString());
 						ObjectMapper jsonMapper = new ObjectMapper();
@@ -301,10 +304,12 @@ public class PolicyCreation extends AbstractPolicyCreation{
 						policyData.setJsonBody(jsonBody);
 					}
 					newPolicy = new CreateClosedLoopPerformanceMetrics(policyData);
-				}else if (policyConfigType.equalsIgnoreCase("Micro Service")) {
+				}else if ("Micro Service".equalsIgnoreCase(policyConfigType)) {
 					newPolicy = new MicroServiceConfigPolicy(policyData);
+				}else if ("Optimization".equalsIgnoreCase(policyConfigType)) {
+					newPolicy = new OptimizationConfigPolicy(policyData);
 				}
-			}else if(policyType.equalsIgnoreCase("Action")) {
+			}else if("Action".equalsIgnoreCase(policyType)) {
 				if(policyData.getApiflag() == null){
 					List<String> dynamicRuleAlgorithmLabels = new LinkedList<>();
 					List<String> dynamicRuleAlgorithmCombo = new LinkedList<>();
@@ -360,8 +365,8 @@ public class PolicyCreation extends AbstractPolicyCreation{
 						policyData.setActionDictMethod(jsonData.getMethod());
 					}
 				}
-				newPolicy = new ActionPolicy(policyData);
-			} else if (policyType.equalsIgnoreCase("Decision")) {
+				newPolicy = new ActionPolicy(policyData, commonClassDao);
+			} else if ("Decision".equalsIgnoreCase(policyType)) {
 				if(policyData.getApiflag() == null){
 					Map<String, String> settingsMap = new HashMap<>();
 					Map<String, String> treatmentMap = new HashMap<>();
@@ -374,7 +379,7 @@ public class PolicyCreation extends AbstractPolicyCreation{
 					List<String> errorCodeList = new LinkedList<>();
 					List<String> treatmentList = new LinkedList<>();
 
-					if(policyData.getSettings().size() > 0){
+					if(!policyData.getSettings().isEmpty()){
 						for(Object settingsData : policyData.getSettings()){
 							if(settingsData instanceof LinkedHashMap<?, ?>){
 								String key = ((LinkedHashMap<?, ?>) settingsData).get("key").toString();
@@ -445,7 +450,7 @@ public class PolicyCreation extends AbstractPolicyCreation{
 					policyData.setErrorCodeList(errorCodeList);
 					policyData.setTreatmentList(treatmentList);
 				}
-				newPolicy = new DecisionPolicy(policyData);
+				newPolicy = new DecisionPolicy(policyData, commonClassDao);
 			}
 
 			if(newPolicy != null){
@@ -455,7 +460,7 @@ public class PolicyCreation extends AbstractPolicyCreation{
 				status = HttpStatus.INTERNAL_SERVER_ERROR;
 				response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);								
 				response.addHeader("error", "error");
-				return new ResponseEntity<String>(body, status);
+				return new ResponseEntity<>(body, status);
 			}
 			
 			PolicyDBDaoTransaction policyDBDaoTransaction = null;