X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fcontroller%2FMicroServiceDictionaryController.java;h=dfd7af48d78dfa5ee9aee2ede9419354cf44da04;hp=5b42fc3103b7594c80626a5340880b3a19d0d4fc;hb=e4ac1ef3c51fc9afe44849ada5bea8c3d6057897;hpb=f18fbfc026de9cf02126f57844c37abfee607394

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java
index 5b42fc310..dfd7af48d 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java
@@ -24,6 +24,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,8 +33,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.lang.StringUtils;
 import org.json.JSONObject;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
@@ -42,7 +45,7 @@ import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
 import org.onap.policy.pap.xacml.rest.util.DictionaryUtils;
 import org.onap.policy.pap.xacml.rest.util.JsonMessage;
 import org.onap.policy.rest.dao.CommonClassDao;
-import org.onap.policy.rest.jpa.DCAEuuid;
+import org.onap.policy.rest.jpa.DcaeUuid;
 import org.onap.policy.rest.jpa.DictionaryData;
 import org.onap.policy.rest.jpa.MicroServiceAttribute;
 import org.onap.policy.rest.jpa.MicroServiceConfigName;
@@ -110,18 +113,22 @@ public class MicroServiceDictionaryController {
 
     private MicroServiceModels newModel;
 
-    @RequestMapping(value = {"/get_DCAEUUIDDataByName"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_DCAEUUIDDataByName"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getDCAEUUIDDictionaryByNameEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
-        utils.getDataByEntity(response, dcaeUUIDDatas, "name", DCAEuuid.class);
+        utils.getDataByEntity(response, dcaeUUIDDatas, "name", DcaeUuid.class);
     }
 
-    @RequestMapping(value = {"/get_DCAEUUIDData"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_DCAEUUIDData"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getDCAEUUIDDictionaryEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
-        utils.getData(response, dcaeUUIDDatas, DCAEuuid.class);
+        utils.getData(response, dcaeUUIDDatas, DcaeUuid.class);
     }
 
     @RequestMapping(value = {"/ms_dictionary/save_dcaeUUID"}, method = {RequestMethod.POST})
@@ -133,17 +140,17 @@ public class MicroServiceDictionaryController {
             ObjectMapper mapper = new ObjectMapper();
             mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
             JsonNode root = mapper.readTree(request.getReader());
-            DCAEuuid dCAEuuid;
+            DcaeUuid dCAEuuid;
             if (fromAPI) {
-                dCAEuuid = mapper.readValue(root.get(dictionaryFields).toString(), DCAEuuid.class);
+                dCAEuuid = mapper.readValue(root.get(dictionaryFields).toString(), DcaeUuid.class);
             } else {
-                dCAEuuid = mapper.readValue(root.get("dcaeUUIDDictionaryData").toString(), DCAEuuid.class);
+                dCAEuuid = mapper.readValue(root.get("dcaeUUIDDictionaryData").toString(), DcaeUuid.class);
             }
 
-            List<Object> duplicateData = commonClassDao.checkDuplicateEntry(dCAEuuid.getName(), "name", DCAEuuid.class);
+            List<Object> duplicateData = commonClassDao.checkDuplicateEntry(dCAEuuid.getName(), "name", DcaeUuid.class);
             boolean duplicateflag = false;
             if (duplicateData != null && !duplicateData.isEmpty()) {
-                DCAEuuid data = (DCAEuuid) duplicateData.get(0);
+                DcaeUuid data = (DcaeUuid) duplicateData.get(0);
                 if (request.getParameter(operation) != null && "update".equals(request.getParameter(operation))) {
                     dCAEuuid.setId(data.getId());
                 } else if ((request.getParameter(operation) != null
@@ -159,7 +166,7 @@ public class MicroServiceDictionaryController {
                 } else {
                     commonClassDao.update(dCAEuuid);
                 }
-                responseString = mapper.writeValueAsString(commonClassDao.getData(DCAEuuid.class));
+                responseString = mapper.writeValueAsString(commonClassDao.getData(DcaeUuid.class));
             } else {
                 responseString = duplicateResponseString;
             }
@@ -177,24 +184,30 @@ public class MicroServiceDictionaryController {
     @RequestMapping(value = {"/ms_dictionary/remove_dcaeuuid"}, method = {RequestMethod.POST})
     public void removeDCAEUUIDDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException {
         DictionaryUtils utils = getDictionaryUtilsInstance();
-        utils.removeData(request, response, dcaeUUIDDatas, DCAEuuid.class);
+        utils.removeData(request, response, dcaeUUIDDatas, DcaeUuid.class);
     }
 
-    @RequestMapping(value = {"/get_MicroServiceConfigNameDataByName"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_MicroServiceConfigNameDataByName"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getMicroServiceConfigNameByNameDictionaryEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.getDataByEntity(response, microServiceConfigNameDatas, "name", MicroServiceConfigName.class);
     }
 
-    @RequestMapping(value = {"/get_MicroServiceConfigNameData"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_MicroServiceConfigNameData"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getMicroServiceConfigNameDictionaryEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.getData(response, microServiceConfigNameDatas, MicroServiceConfigName.class);
     }
 
-    @RequestMapping(value = {"/get_MicroServiceDictData"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_MicroServiceDictData"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getMicroServiceDictNameDictionaryEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
@@ -328,14 +341,18 @@ public class MicroServiceDictionaryController {
         utils.removeData(request, response, microServiceConfigNameDatas, MicroServiceConfigName.class);
     }
 
-    @RequestMapping(value = {"/get_MicroServiceLocationDataByName"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_MicroServiceLocationDataByName"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getMicroServiceLocationByNameDictionaryEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.getDataByEntity(response, microServiceLocationDatas, "name", MicroServiceLocation.class);
     }
 
-    @RequestMapping(value = {"/get_MicroServiceLocationData"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_MicroServiceLocationData"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getMicroServiceLocationDictionaryEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
@@ -403,14 +420,18 @@ public class MicroServiceDictionaryController {
         utils.removeData(request, response, microServiceLocationDatas, MicroServiceLocation.class);
     }
 
-    @RequestMapping(value = {"/get_MicroServiceAttributeDataByName"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_MicroServiceAttributeDataByName"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getMicroServiceAttributeByNameDictionaryEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.getDataByEntity(response, microServiceAttributeDatas, "name", MicroServiceAttribute.class);
     }
 
-    @RequestMapping(value = {"/get_MicroServiceAttributeData"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_MicroServiceAttributeData"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getMicroServiceAttributeDictionaryEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
@@ -481,15 +502,18 @@ public class MicroServiceDictionaryController {
         utils.removeData(request, response, microServiceAttributeDatas, MicroServiceAttribute.class);
     }
 
-
-    @RequestMapping(value = {"/get_MicroServiceModelsDataByName"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_MicroServiceModelsDataByName"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getMicroServiceModelsDictionaryByNameEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.getDataByEntity(response, microServiceModelsDictionaryDatas, modelName, MicroServiceModels.class);
     }
 
-    @RequestMapping(value = {"/get_MicroServiceModelsDataByVersion"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_MicroServiceModelsDataByVersion"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getMicroServiceModelsDictionaryByVersionEntityData(HttpServletRequest request,
             HttpServletResponse response) {
@@ -515,14 +539,18 @@ public class MicroServiceDictionaryController {
         }
     }
 
-    @RequestMapping(value = {"/get_MicroServiceModelsData"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_MicroServiceModelsData"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getMicroServiceModelsDictionaryEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.getData(response, microServiceModelsDictionaryDatas, MicroServiceModels.class);
     }
 
-    @RequestMapping(value = {"/get_MicroServiceModelsDataServiceVersion"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_MicroServiceModelsDataServiceVersion"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getMicroServiceModelsDictionaryEntityDataServiceVersion(HttpServletResponse response) {
         try {
@@ -550,7 +578,9 @@ public class MicroServiceDictionaryController {
         }
     }
 
-    @RequestMapping(value = {"/get_MicroServiceModelsDataByClass"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_MicroServiceModelsDataByClass"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getMicroServiceModelsDictionaryClassEntityData(HttpServletResponse response) {
         try {
@@ -798,21 +828,24 @@ public class MicroServiceDictionaryController {
         return returnList;
     }
 
-    @RequestMapping(value = {"/get_MicroServiceHeaderDefaultsDataByName"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_MicroServiceHeaderDefaultsDataByName"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getMicroServiceHeaderDefaultsEntityDataByName(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.getDataByEntity(response, microServiceHeaderDefaultDatas, "modelName", MicroserviceHeaderdeFaults.class);
     }
 
-    @RequestMapping(value = {"/get_MicroServiceHeaderDefaultsData"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_MicroServiceHeaderDefaultsData"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getMicroServiceHeaderDefaultsEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.getData(response, microServiceHeaderDefaultDatas, MicroserviceHeaderdeFaults.class);
     }
 
-
     @RequestMapping(value = {"/ms_dictionary/save_headerDefaults"}, method = {RequestMethod.POST})
     public ModelAndView saveMicroServiceHeaderDefaultValues(HttpServletRequest request, HttpServletResponse response)
             throws IOException {