X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Futil%2FMSModelUtils.java;h=f145f4db1e1016f43ea0c6fbc4910075acf12372;hb=51842453b199a7c3a6785f4ab047612d50eab3b9;hp=0384d0b2c49ca651f75585ebdb97d491a4cb5ec0;hpb=1134bd40da28d3833a0dd4f821e75ec938f6061f;p=policy%2Fengine.git 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 0384d0b2c..f145f4db1 100644 --- 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 STRING = "string"; - private static final String INTEGER = "integer"; + public static final String STRING = "string"; + public static final String INTEGER = "integer"; private static final String BOOLEAN = "boolean"; - private static final String LIST = "list"; - private static final String MAP = "map"; + public static final String LIST = "list"; + public static final String MAP = "map"; 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); - 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);