Merge "Fixed a bug on view and editor screens"

[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 6405e6f..b349ada 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
@@ -57,6 +57,7 @@ import javax.json.JsonArray;
 import javax.json.JsonArrayBuilder;
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
+import javax.json.JsonReader;
 import javax.json.JsonValue;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -72,6 +73,7 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.controller.PolicyController;
 import org.onap.policy.rest.XACMLRestProperties;
 import org.onap.policy.rest.adapter.PolicyRestAdapter;
 import org.onap.policy.rest.dao.CommonClassDao;
@@ -96,7 +98,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.gson.Gson;
@@ -273,10 +274,12 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
                                final JsonNode value = field.getValue();
                                if("content".equalsIgnoreCase(key)){
                                        String contentStr = value.toString();
-                                   JsonObject jsonContent = Json.createReader(new StringReader(contentStr)).readObject();                                  
-                                   removed = removeNull(jsonContent);
-                                   if(!jsonContent.toString().equals(removed.toString())){
-                                       contentChanged = true;  
+                                   try (JsonReader jsonReader = Json.createReader(new StringReader(contentStr))) {             
+                                       JsonObject jsonContent = jsonReader.readObject();
+                                           removed = removeNull(jsonContent);
+                                           if(!jsonContent.toString().equals(removed.toString())){
+                                               contentChanged = true;  
+                                           }
                                    }
                                }
                                if  (value==null || value.isNull()){
@@ -1236,7 +1239,8 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
                                                                                        policyAdapter.setGuard(value);
                                                                                }
                                                                                if (attributeId.equals("TTLDate") && !value.contains("NA")){
-                                                                                       String newDate = convertDate(value, true);
+                                                                                       PolicyController controller = new PolicyController();
+                                                                                       String newDate = controller.convertDate(value);
                                                                                        policyAdapter.setTtlDate(newDate);
                                                                                }
                                                                        }
@@ -1249,15 +1253,6 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
                        }
                }
        }
-
-       private String convertDate(String dateTTL, boolean portalType) {
-               String formateDate = null;
-               String[] date  = dateTTL.split("T");
-               String[] parts = date[0].split("-");
-                       
-               formateDate = parts[2] + "-" + parts[1] + "-" + parts[0];
-               return formateDate;
-       }
        
        public static Map<String, String> convert(String str, String split) {
                Map<String, String> map = new HashMap<>();
@@ -1384,6 +1379,14 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
        
        @RequestMapping(value={"/ms_dictionary/set_MSModelData"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
        public void SetMSModelData(HttpServletRequest request, HttpServletResponse response) throws IOException, FileUploadException{
+               modelList = new ArrayList<>();
+               dirDependencyList = new ArrayList<>();
+               classMap = new HashMap<>();
+               retmap = new HashMap<>();
+               uniqueKeys= new HashSet<>();
+               uniqueDataKeys= new HashSet<>();
+               dataListBuffer=new StringBuilder();
+               dataConstraints= new ArrayList <>();
                List<FileItem> items = new ServletFileUpload(new DiskFileItemFactory()).parseRequest(request);
                boolean zip = false;
                boolean yml= false;