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%2Fcomponents%2FCreateBRMSRuleTemplate.java;h=9809ad4980a0438f01ccaf244093e5717d08ee67;hb=f0fec2a861ea0a92b27b40882ea38f9422cde0c6;hp=7c0d2683cd24f605186eff4da25e3e7d1fac91ab;hpb=073cc188efe9abb4c010cf674e34e2cf46ef1c52;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateBRMSRuleTemplate.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateBRMSRuleTemplate.java
index 7c0d2683c..9809ad498 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateBRMSRuleTemplate.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateBRMSRuleTemplate.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-PAP-REST
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,40 +34,50 @@ import org.springframework.stereotype.Service;
 
 @Service
 public class CreateBRMSRuleTemplate {
-	private static final Logger LOGGER  = FlexLogger.getLogger(CreateBRMSRuleTemplate.class);
-	private static CommonClassDao commonClassDao;
-	
-	@Autowired
-	public CreateBRMSRuleTemplate(CommonClassDao commonClassDao){
-		CreateBRMSRuleTemplate.commonClassDao = commonClassDao;
-	}
-	
-	public CreateBRMSRuleTemplate() {}
+    private static final Logger LOGGER  = FlexLogger.getLogger(CreateBRMSRuleTemplate.class);
+    private static CommonClassDao commonClassDao;
 
-	public Map<String, String> addRule(String rule, String ruleName, String description, String userID) {
-		Map<String,String> responseMap = new HashMap<>();
-		if(rule!=null && !PolicyUtils.brmsRawValidate(rule).contains("[ERR")){
-			List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ruleName, "ruleName", BRMSParamTemplate.class);
-			if(duplicateData!=null && !duplicateData.isEmpty()){
-				LOGGER.error("Import new service failed.  Service already exists");
-				responseMap.put("DBError", "EXISTS");
-				return responseMap;
-			}else{
-				BRMSParamTemplate brmsParamTemplate = new BRMSParamTemplate();
-				brmsParamTemplate.setDescription(description);
-				brmsParamTemplate.setRuleName(ruleName);
-				brmsParamTemplate.setRule(rule);
-				UserInfo userCreatedBy = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId", userID);
-				brmsParamTemplate.setUserCreatedBy(userCreatedBy);
-				commonClassDao.save(brmsParamTemplate);
-				LOGGER.info("Template created with " + ruleName + " by " + userID);
-			}
-			responseMap.put("success", "success");
-		}else{
-			LOGGER.debug("Error during validating the rule for creating record for BRMS Param Template");
-			responseMap.put("error", "VALIDATION");
-		}
-		return responseMap;
-	}
-	
+    @Autowired
+    public CreateBRMSRuleTemplate(CommonClassDao commonClassDao){
+        CreateBRMSRuleTemplate.commonClassDao = commonClassDao;
+    }
+
+    public CreateBRMSRuleTemplate() {}
+
+    public Map<String, String> addRule(String rule, String ruleName, String description, String userID) {
+        Map<String,String> responseMap = new HashMap<>();
+        if(rule!=null && !PolicyUtils.brmsRawValidate(rule).contains("[ERR")){
+            List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ruleName, "ruleName", BRMSParamTemplate.class);
+            if(duplicateData!=null && !duplicateData.isEmpty()){
+                LOGGER.error("Import new service failed.  Service already exists");
+                responseMap.put("DBError", "EXISTS");
+                return responseMap;
+            }else{
+                BRMSParamTemplate brmsParamTemplate = new BRMSParamTemplate();
+                brmsParamTemplate.setDescription(description);
+                brmsParamTemplate.setRuleName(ruleName);
+                brmsParamTemplate.setRule(rule);
+                UserInfo userCreatedBy = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId", userID);
+                brmsParamTemplate.setUserCreatedBy(userCreatedBy);
+                commonClassDao.save(brmsParamTemplate);
+                LOGGER.info("Template created with " + ruleName + " by " + userID);
+            }
+            responseMap.put("success", "success");
+        }else{
+            LOGGER.debug("Error during validating the rule for creating record for BRMS Param Template");
+            responseMap.put("error", "VALIDATION");
+        }
+        return responseMap;
+    }
+
+    public static boolean validateRuleParams(String rule) {
+        CreateBrmsParamPolicy policy = new CreateBrmsParamPolicy();
+        Map<String, String> paramValues = policy.findType(rule);
+        for(String key : paramValues.keySet()) {
+            if(!PolicyUtils.SUCCESS.equals(PolicyUtils.policySpecialCharValidator(key))){
+                return false;
+            }
+        }
+        return true;
+    }
 }