Code Review
/
policy
/
engine.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgraded the latest ONAP SDK
[policy/engine.git]
/
POLICY-SDK-APP
/
src
/
main
/
java
/
org
/
onap
/
policy
/
controller
/
CreateBRMSParamController.java
diff --git
a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java
b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java
index
fc7cb60
..
33c5883
100644
(file)
--- a/
POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java
+++ b/
POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java
@@
-44,7
+44,7
@@
import org.onap.policy.rest.dao.CommonClassDao;
import org.onap.policy.rest.jpa.BRMSParamTemplate;
import org.onap.policy.rest.jpa.PolicyEntity;
import org.onap.policy.xacml.api.XACMLErrorConstants;
import org.onap.policy.rest.jpa.BRMSParamTemplate;
import org.onap.policy.rest.jpa.PolicyEntity;
import org.onap.policy.xacml.api.XACMLErrorConstants;
-import org.o
penecom
p.portalsdk.core.controller.RestrictedBaseController;
+import org.o
na
p.portalsdk.core.controller.RestrictedBaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@
-173,7
+173,7
@@
public class CreateBRMSParamController extends RestrictedBaseController {
if (flag) {
params.append(line);
}
if (flag) {
params.append(line);
}
- if (line.contains("declare Params")) {
+ if (line.contains("declare Pa
pPa
rams")) {
params.append(line);
flag = true;
}
params.append(line);
flag = true;
}
@@
-181,7
+181,7
@@
public class CreateBRMSParamController extends RestrictedBaseController {
break;
}
}
break;
}
}
- params = new StringBuilder(params.toString().replace("declare Params", "").replace("end", "").replaceAll("\\s+", ""));
+ params = new StringBuilder(params.toString().replace("declare Pa
pPa
rams", "").replace("end", "").replaceAll("\\s+", ""));
String[] components = params.toString().split(":");
String caption = "";
for (int i = 0; i < components.length; i++) {
String[] components = params.toString().split(":");
String caption = "";
for (int i = 0; i < components.length; i++) {
@@
-400,7
+400,7
@@
public class CreateBRMSParamController extends RestrictedBaseController {
if (flag) {
params.append(line);
}
if (flag) {
params.append(line);
}
- if (line.contains("rule") && line.contains(".Params\"")) {
+ if (line.contains("rule") && line.contains(".Pa
pPa
rams\"")) {
params.append(line);
flag = true;
}
params.append(line);
flag = true;
}
@@
-408,8
+408,8
@@
public class CreateBRMSParamController extends RestrictedBaseController {
break;
}
}
break;
}
}
- params = new StringBuilder(params.substring(params.indexOf(".Pa
rams\"")+ 8
));
- params = new StringBuilder(params.toString().replaceAll("\\s+", "").replace("salience1000whenthenPa
ramsparams=new
Params();","")
+ params = new StringBuilder(params.substring(params.indexOf(".Pa
pParams\"")+ 11
));
+ params = new StringBuilder(params.toString().replaceAll("\\s+", "").replace("salience1000whenthenPa
pParamsparams=newPap
Params();","")
.replace("insert(params);end", "")
.replace("params.set", ""));
String[] components = params.toString().split("\\);");
.replace("insert(params);end", "")
.replace("params.set", ""));
String[] components = params.toString().split("\\);");
@@
-462,7
+462,7
@@
public class CreateBRMSParamController extends RestrictedBaseController {
brmsTemplateVlaue + policyData.getRuleName() + "%$> \n */ \n";
body = body + findRule((String) policyData.getRuleName()) + "\n";
StringBuilder generatedRule = new StringBuilder();
brmsTemplateVlaue + policyData.getRuleName() + "%$> \n */ \n";
body = body + findRule((String) policyData.getRuleName()) + "\n";
StringBuilder generatedRule = new StringBuilder();
- generatedRule.append("rule \""+ policyData.getDomainDir().replace("\\", ".") +".Config_BRMS_Param_" + policyData.getPolicyName()+".Pa
rams\" \n\tsalience 1000 \n\twhen\n\tthen\n\t\tParams params = new
Params();");
+ generatedRule.append("rule \""+ policyData.getDomainDir().replace("\\", ".") +".Config_BRMS_Param_" + policyData.getPolicyName()+".Pa
pParams\" \n\tsalience 1000 \n\twhen\n\tthen\n\t\tPapParams params = new Pap
Params();");
if(policyData.getRuleData().size() > 0){
for(Object keyValue: policyData.getRuleData().keySet()){
if(policyData.getRuleData().size() > 0){
for(Object keyValue: policyData.getRuleData().keySet()){