Consolidate PolicyRestAdapter setup

Put common code into PolicyEngineUtils that the controllers use to
populate the PolicyRestController.

Also some more sonar cleanup and formatting of XML files.

Shortened 120 line characters. Removed some trailing spaces
from comments.

Fixed up one JUnit.

Licenses.

Issue-ID: POLICY-2133
Change-Id: Id7d8ac3ab60331535f048ec0f26aeb17a099414e
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

1 files changed, 68 insertions, 76 deletions

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/BRMSDictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/BRMSDictionaryController.java
index d6ebed2b8..a669d82a0 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/BRMSDictionaryController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/BRMSDictionaryController.java
@@ -23,13 +23,16 @@ package org.onap.policy.pap.xacml.rest.controller;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import java.io.IOException;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.io.IOUtils;
 import org.onap.policy.api.PEDependency;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
@@ -51,7 +54,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
-
 @Controller
 public class BRMSDictionaryController {
 
@@ -91,14 +93,18 @@ public class BRMSDictionaryController {
         return DictionaryUtils.getDictionaryUtils();
     }
 
-    @RequestMapping(value = {"/get_BRMSParamDataByName"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_BRMSParamDataByName"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getBRMSParamDictionaryByNameEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.getDataByEntity(response, brmsParamDatas, ruleName, BRMSParamTemplate.class);
     }
 
-    @RequestMapping(value = {"/get_BRMSParamData"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_BRMSParamData"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getBRMSParamDictionaryEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
@@ -109,14 +115,13 @@ public class BRMSDictionaryController {
     public static void setRuleData(HttpServletRequest request) throws IOException {
         StringWriter writer = new StringWriter();
         IOUtils.copy(request.getInputStream(), writer, StandardCharsets.UTF_8);
-        String cleanStreamBoundary =
-                writer.toString().replaceFirst("------(.*)(?s).*octet-stream", "");
+        String cleanStreamBoundary = writer.toString().replaceFirst("------(.*)(?s).*octet-stream", "");
         rule = cleanStreamBoundary.substring(0, cleanStreamBoundary.lastIndexOf("end") + 4);
     }
 
     @RequestMapping(value = {"/brms_dictionary/save_BRMSParam"}, method = {RequestMethod.POST})
-    public ModelAndView saveBRMSParamDictionary(HttpServletRequest request,
-            HttpServletResponse response) throws IOException {
+    public ModelAndView saveBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response)
+            throws IOException {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         try {
             boolean fromAPI = utils.isRequestFromAPI(request);
@@ -127,23 +132,22 @@ public class BRMSDictionaryController {
             BRMSParamTemplate bRMSParamTemplateData;
             String userId = null;
             if (fromAPI) {
-                bRMSParamTemplateData = mapper.readValue(root.get(dictionaryFields).toString(),
-                        BRMSParamTemplate.class);
+                bRMSParamTemplateData =
+                        mapper.readValue(root.get(dictionaryFields).toString(), BRMSParamTemplate.class);
                 userId = "API";
             } else {
-                bRMSParamTemplateData = mapper.readValue(
-                        root.get("brmsParamDictionaryData").toString(), BRMSParamTemplate.class);
+                bRMSParamTemplateData =
+                        mapper.readValue(root.get("brmsParamDictionaryData").toString(), BRMSParamTemplate.class);
                 userId = root.get(userid).textValue();
             }
             UserInfo userInfo = utils.getUserInfo(userId);
 
-            List<Object> duplicateData = commonClassDao.checkDuplicateEntry(
-                    bRMSParamTemplateData.getRuleName(), ruleName, BRMSParamTemplate.class);
+            List<Object> duplicateData = commonClassDao.checkDuplicateEntry(bRMSParamTemplateData.getRuleName(),
+                    ruleName, BRMSParamTemplate.class);
             boolean duplicateflag = false;
             if (!duplicateData.isEmpty()) {
                 BRMSParamTemplate data = (BRMSParamTemplate) duplicateData.get(0);
-                if (request.getParameter(operation) != null
-                        && "update".equals(request.getParameter(operation))) {
+                if (request.getParameter(operation) != null && "update".equals(request.getParameter(operation))) {
                     bRMSParamTemplateData.setId(data.getId());
                 } else if ((request.getParameter(operation) != null
                         && !"update".equals(request.getParameter(operation)))
@@ -164,8 +168,7 @@ public class BRMSDictionaryController {
                     } else {
                         commonClassDao.update(bRMSParamTemplateData);
                     }
-                    responseString = mapper
-                            .writeValueAsString(commonClassDao.getData(BRMSParamTemplate.class));
+                    responseString = mapper.writeValueAsString(commonClassDao.getData(BRMSParamTemplate.class));
                 } else {
                     responseString = duplicateResponseString;
                 }
@@ -192,30 +195,32 @@ public class BRMSDictionaryController {
     }
 
     @RequestMapping(value = {"/brms_dictionary/remove_brmsParam"}, method = {RequestMethod.POST})
-    public void removeBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response)
-            throws IOException {
+    public void removeBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.removeData(request, response, brmsParamDatas, BRMSParamTemplate.class);
     }
 
-    @RequestMapping(value = {"/get_BRMSDependencyDataByName"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_BRMSDependencyDataByName"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getBRMSDependencyDictionaryByNameEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.getDataByEntity(response, brmsDependencyDatas, dependencyName, BRMSDependency.class);
     }
 
-    @RequestMapping(value = {"/get_BRMSDependencyData"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_BRMSDependencyData"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getBRMSDependencyDictionaryEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.getData(response, brmsDependencyDatas, BRMSDependency.class);
     }
 
-    @RequestMapping(value = {"/brms_dictionary/save_BRMSDependencyData"},
-            method = {RequestMethod.POST})
-    public ModelAndView saveBRMSDependencyDictionary(HttpServletRequest request,
-            HttpServletResponse response) throws IOException {
+    @RequestMapping(value = {"/brms_dictionary/save_BRMSDependencyData"}, method = {RequestMethod.POST})
+    public ModelAndView saveBRMSDependencyDictionary(HttpServletRequest request, HttpServletResponse response)
+            throws IOException {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         try {
             LOGGER.debug("DictionaryController:  saveBRMSDependencyDictionary() is called");
@@ -227,43 +232,38 @@ public class BRMSDictionaryController {
             BRMSDependency brmsDependency;
             String userId = null;
             if (fromAPI) {
-                brmsDependency = mapper.readValue(root.get(dictionaryFields).toString(),
-                        BRMSDependency.class);
+                brmsDependency = mapper.readValue(root.get(dictionaryFields).toString(), BRMSDependency.class);
                 userId = "API";
             } else {
-                brmsDependency = mapper.readValue(
-                        root.get("brmsDependencyDictionaryData").toString(), BRMSDependency.class);
+                brmsDependency =
+                        mapper.readValue(root.get("brmsDependencyDictionaryData").toString(), BRMSDependency.class);
                 userId = root.get(userid).textValue();
             }
             UserInfo userInfo = utils.getUserInfo(userId);
 
-            List<Object> duplicateData = commonClassDao.checkDuplicateEntry(
-                    brmsDependency.getDependencyName(), dependencyName, BRMSDependency.class);
+            List<Object> duplicateData = commonClassDao.checkDuplicateEntry(brmsDependency.getDependencyName(),
+                    dependencyName, BRMSDependency.class);
             boolean duplicateflag = false;
             if (!duplicateData.isEmpty()) {
                 BRMSDependency data = (BRMSDependency) duplicateData.get(0);
-                if (request.getParameter(operation) != null
-                        && "update".equals(request.getParameter(operation))) {
+                if (request.getParameter(operation) != null && "update".equals(request.getParameter(operation))) {
                     brmsDependency.setId(data.getId());
                 } else if ((request.getParameter(operation) != null
                         && !"update".equals(request.getParameter(operation)))
-                        || (request.getParameter(operation) == null
-                                && (data.getId() != brmsDependency.getId()))) {
+                        || (request.getParameter(operation) == null && (data.getId() != brmsDependency.getId()))) {
                     duplicateflag = true;
                 }
             }
             LOGGER.audit("the userId from the onap portal is: " + userId);
             String responseString = null;
-            if (brmsDependency.getDependency() != null
-                    && !("").equals(brmsDependency.getDependency().trim())) {
+            if (brmsDependency.getDependency() != null && !("").equals(brmsDependency.getDependency().trim())) {
                 PEDependency dependency = null;
                 try {
-                    dependency = PolicyUtils.jsonStringToObject(brmsDependency.getDependency(),
-                            PEDependency.class);
+                    dependency = PolicyUtils.jsonStringToObject(brmsDependency.getDependency(), PEDependency.class);
                 } catch (Exception e) {
                     LOGGER.error(XACMLErrorConstants.ERROR_SCHEMA_INVALID
-                            + "wrong data given for BRMS PEDependency Dictionary : "
-                            + brmsDependency.getDependency(), e);
+                            + "wrong data given for BRMS PEDependency Dictionary : " + brmsDependency.getDependency(),
+                            e);
                 }
                 if (dependency == null) {
                     responseString = errorMessage;
@@ -277,8 +277,7 @@ public class BRMSDictionaryController {
                             brmsDependency.setModifiedDate(new Date());
                             commonClassDao.update(brmsDependency);
                         }
-                        responseString = mapper
-                                .writeValueAsString(commonClassDao.getData(BRMSDependency.class));
+                        responseString = mapper.writeValueAsString(commonClassDao.getData(BRMSDependency.class));
                     } else {
                         responseString = duplicateResponseString;
                     }
@@ -302,33 +301,34 @@ public class BRMSDictionaryController {
         return null;
     }
 
-    @RequestMapping(value = {"/brms_dictionary/remove_brmsDependency"},
-            method = {RequestMethod.POST})
-    public void removeBRMSDependencyDictionary(HttpServletRequest request,
-            HttpServletResponse response) throws IOException {
+    @RequestMapping(value = {"/brms_dictionary/remove_brmsDependency"}, method = {RequestMethod.POST})
+    public void removeBRMSDependencyDictionary(HttpServletRequest request, HttpServletResponse response)
+            throws IOException {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.removeData(request, response, brmsDependencyDatas, BRMSDependency.class);
     }
 
-
-    @RequestMapping(value = {"/get_BRMSControllerDataByName"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_BRMSControllerDataByName"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getBRMSControllerDictionaryByNameEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.getDataByEntity(response, brmsControllerDatas, controllerName, BRMSController.class);
     }
 
-    @RequestMapping(value = {"/get_BRMSControllerData"}, method = {RequestMethod.GET},
+    @RequestMapping(
+            value = {"/get_BRMSControllerData"},
+            method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getBRMSControllerDictionaryEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.getData(response, brmsControllerDatas, BRMSController.class);
     }
 
-    @RequestMapping(value = {"/brms_dictionary/save_BRMSControllerData"},
-            method = {RequestMethod.POST})
-    public ModelAndView saveBRMSControllerDictionary(HttpServletRequest request,
-            HttpServletResponse response) throws IOException {
+    @RequestMapping(value = {"/brms_dictionary/save_BRMSControllerData"}, method = {RequestMethod.POST})
+    public ModelAndView saveBRMSControllerDictionary(HttpServletRequest request, HttpServletResponse response)
+            throws IOException {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         try {
             LOGGER.debug("DictionaryController:  saveBRMSControllerDictionary() is called");
@@ -339,42 +339,36 @@ public class BRMSDictionaryController {
             BRMSController brmsController;
             String userId = null;
             if (fromAPI) {
-                brmsController = mapper.readValue(root.get(dictionaryFields).toString(),
-                        BRMSController.class);
+                brmsController = mapper.readValue(root.get(dictionaryFields).toString(), BRMSController.class);
                 userId = "API";
             } else {
-                brmsController = mapper.readValue(
-                        root.get("brmsControllerDictionaryData").toString(), BRMSController.class);
+                brmsController =
+                        mapper.readValue(root.get("brmsControllerDictionaryData").toString(), BRMSController.class);
                 userId = root.get(userid).textValue();
             }
             UserInfo userInfo = utils.getUserInfo(userId);
 
-            List<Object> duplicateData = commonClassDao.checkDuplicateEntry(
-                    brmsController.getControllerName(), controllerName, BRMSController.class);
+            List<Object> duplicateData = commonClassDao.checkDuplicateEntry(brmsController.getControllerName(),
+                    controllerName, BRMSController.class);
             boolean duplicateflag = false;
             if (!duplicateData.isEmpty()) {
                 BRMSController data = (BRMSController) duplicateData.get(0);
-                if (request.getParameter(operation) != null
-                        && "update".equals(request.getParameter(operation))) {
+                if (request.getParameter(operation) != null && "update".equals(request.getParameter(operation))) {
                     brmsController.setId(data.getId());
                 } else if ((request.getParameter(operation) != null
                         && !"update".equals(request.getParameter(operation)))
-                        || (request.getParameter(operation) == null
-                                && (data.getId() != brmsController.getId()))) {
+                        || (request.getParameter(operation) == null && (data.getId() != brmsController.getId()))) {
                     duplicateflag = true;
                 }
             }
             String responseString = null;
-            if (brmsController.getController() != null
-                    && !("").equals(brmsController.getController().trim())) {
+            if (brmsController.getController() != null && !("").equals(brmsController.getController().trim())) {
                 PEDependency dependency = null;
                 try {
-                    dependency = PolicyUtils.jsonStringToObject(brmsController.getController(),
-                            PEDependency.class);
+                    dependency = PolicyUtils.jsonStringToObject(brmsController.getController(), PEDependency.class);
                 } catch (Exception e) {
                     LOGGER.error(XACMLErrorConstants.ERROR_SCHEMA_INVALID
-                            + "wrong data given for BRMS Controller Dictionary : "
-                            + brmsController.getController(), e);
+                            + "wrong data given for BRMS Controller Dictionary : " + brmsController.getController(), e);
                 }
                 if (dependency == null) {
                     responseString = errorMessage;
@@ -388,8 +382,7 @@ public class BRMSDictionaryController {
                             brmsController.setModifiedDate(new Date());
                             commonClassDao.update(brmsController);
                         }
-                        responseString =
-                                mapper.writeValueAsString(commonClassDao.getData(OnapName.class));
+                        responseString = mapper.writeValueAsString(commonClassDao.getData(OnapName.class));
                     } else {
                         responseString = duplicateResponseString;
                     }
@@ -412,10 +405,9 @@ public class BRMSDictionaryController {
         return null;
     }
 
-    @RequestMapping(value = {"/brms_dictionary/remove_brmsController"},
-            method = {RequestMethod.POST})
-    public void removeBRMSControllerDictionary(HttpServletRequest request,
-            HttpServletResponse response) throws IOException {
+    @RequestMapping(value = {"/brms_dictionary/remove_brmsController"}, method = {RequestMethod.POST})
+    public void removeBRMSControllerDictionary(HttpServletRequest request, HttpServletResponse response)
+            throws IOException {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.removeData(request, response, brmsControllerDatas, BRMSController.class);
     }