Merge "Fix R3 model for OOF Policy Optimization"

[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / controller / CreateDcaeMicroServiceController.java

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
index 0f315a3..e7ed57a 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
@@ -582,7 +582,11 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
                
                //Get element order info 
                String dataOrderInfo = returnModel.getDataOrderInfo();
-               
+        if(dataOrderInfo != null && !dataOrderInfo.startsWith("\"")){
+            dataOrderInfo = "\"" + dataOrderInfo + "\"";
+        }
+        LOGGER.info("dataOrderInfo : " + dataOrderInfo);
+        
                String allManyTrueKeys = "";
                if(allkeys != null){
                        allManyTrueKeys = allkeys.toString();
@@ -1177,7 +1181,17 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
                        fileList = listModelFiles(this.directory);
                }else if (yml==true){
                        
-                       msMLUtils.parseTosca(this.newFile);
+                       errorMsg = msMLUtils.parseTosca(this.newFile);
+                       if(errorMsg != null){
+                               PrintWriter out = response.getWriter();                         
+                               response.setCharacterEncoding("UTF-8");
+                               response.setContentType("application / json");
+                               request.setCharacterEncoding("UTF-8");
+                               JSONObject j = new JSONObject();
+                               j.put("errorMsg", errorMsg);
+                           out.write(j.toString());
+                           return;
+                       }
                        
                }else {
                        File file = new File(this.newFile);