summaryrefslogtreecommitdiffstats
path: root/ONAP-REST/src/main
diff options
context:
space:
mode:
authorWang,Frank(gw1218) <gw1218@att.com>2018-04-12 11:59:00 -0500
committerWang,Frank(gw1218) <gw1218@att.com>2018-04-12 11:59:16 -0500
commit36e8f5e2c625cd76f183757942db9a80a30251ab (patch)
tree1e47f85b6c58b8af338d4510b7b9614d4b6281ad /ONAP-REST/src/main
parentda09b036ff8f3c927e552e33e1476be4ba488efa (diff)
Fix Wrong Data Names
Fix wrong data names due to reponse changes Issue-ID: POLICY-740 Change-Id: I28db745f88ccecd67f3daa30adf70cc69645b496 Signed-off-by: Wang,Frank(gw1218) <gw1218@att.com>
Diffstat (limited to 'ONAP-REST/src/main')
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java9
1 files changed, 7 insertions, 2 deletions
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 91e7626ea..7db16bda5 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
@@ -96,6 +96,7 @@ public class MSModelUtils {
public static final String STRING="string";
public static final String INTEGER="integer";
public static final String LIST="list";
+ public static final String MAP="map";
public static final String DEFAULT=".default";
public static final String MANYFALSE=":MANY-false";
public static final String MANYTRUE=":MANY-true";
@@ -1075,7 +1076,7 @@ public class MSModelUtils {
attributeIndividualStringBuilder.append(requiredValue+MANYFALSE);
dataMapForJson.put(uniqueDataKey, attributeIndividualStringBuilder.toString());
}
- else if(typeValue != null && typeValue.equalsIgnoreCase(LIST)){
+ else if(LIST.equalsIgnoreCase(typeValue) || MAP.equalsIgnoreCase(typeValue)){
logger.info("requiredValue is:"+ requiredValue);
String findList= DATATYPE+uniqueDataKeySplit[0]+PROPERTIES+uniqueDataKeySplit[1]+".entry_schema.type";
String listValue=map.get(findList);
@@ -1091,7 +1092,11 @@ public class MSModelUtils {
}//Its string
else{
StringBuilder stringListItems= new StringBuilder();
- stringListItems.append(uniqueDataKeySplit[1].toUpperCase()+REQUIREDVALUE+requiredValue +MANYFALSE);
+ if(LIST.equalsIgnoreCase(typeValue)){
+ stringListItems.append(uniqueDataKeySplit[1].toUpperCase()+":required-"+requiredValue +":MANY-false");
+ }else if( MAP.equalsIgnoreCase(typeValue)){
+ stringListItems.append(uniqueDataKeySplit[1].toUpperCase()+":required-"+requiredValue +":MANY-true");
+ }
dataMapForJson.put(uniqueDataKey, stringListItems.toString());
dataListBuffer.append(uniqueDataKeySplit[1].toUpperCase()+"=[");
for(int i=0;i<10;i++){