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
Removed Objective From keyword check in parser
[policy/engine.git]
/
ONAP-REST
/
src
/
main
/
java
/
org
/
onap
/
policy
/
rest
/
util
/
MSModelUtils.java
diff --git
a/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
b/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
index
0384d0b
..
f145f4d
100644
(file)
--- a/
ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
+++ b/
ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
@@
-93,11
+93,11
@@
public class MSModelUtils {
private static final String TYPE = ".type";
private static final String REQUIRED = ".required";
private static final String MATCHABLE = ".matchable";
private static final String TYPE = ".type";
private static final String REQUIRED = ".required";
private static final String MATCHABLE = ".matchable";
- p
rivate static final String
STRING = "string";
- p
rivate static final String
INTEGER = "integer";
+ p
ublic static final String
STRING = "string";
+ p
ublic static final String
INTEGER = "integer";
private static final String BOOLEAN = "boolean";
private static final String BOOLEAN = "boolean";
- p
rivate static final String
LIST = "list";
- p
rivate static final String
MAP = "map";
+ p
ublic static final String
LIST = "list";
+ p
ublic static final String
MAP = "map";
private static final String DEFAULT = ".default";
private static final String MANYFALSE = ":MANY-false";
private static final String DESCRIPTION = ".description";
private static final String DEFAULT = ".default";
private static final String MANYFALSE = ":MANY-false";
private static final String DESCRIPTION = ".description";
@@
-1214,9
+1214,7
@@
public class MSModelUtils {
hm = new LinkedHashMap<>();
String keyStr = key.substring(key.lastIndexOf('.') + 1);
String valueStr = map.get(key);
hm = new LinkedHashMap<>();
String keyStr = key.substring(key.lastIndexOf('.') + 1);
String valueStr = map.get(key);
- if (key.contains(".objective.")) {
- throw new ParserException("Attribute objective is a key word. Please use a different name");
- }
+
if (("type").equals(keyStr)) {
if (!key.contains("entry_schema")) {
hm.put(keyStr, valueStr);
if (("type").equals(keyStr)) {
if (!key.contains("entry_schema")) {
hm.put(keyStr, valueStr);