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%2FActionPolicyDictionaryController.java;h=f576bffe85152619c3c9c86ae772d34b89a32c23;hp=8e620408bdec1c8b696cecbbf8814f8b3da8d972;hb=1e61676b77dd09659027b8984f050df7e8538526;hpb=f18fbfc026de9cf02126f57844c37abfee607394

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/ActionPolicyDictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/ActionPolicyDictionaryController.java
index 8e620408b..f576bffe8 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/ActionPolicyDictionaryController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/ActionPolicyDictionaryController.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-PAP-REST
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,10 @@
 
 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.util.Date;
 import java.util.List;
@@ -38,10 +42,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 @Controller
 public class ActionPolicyDictionaryController {
 
@@ -51,36 +51,43 @@ public class ActionPolicyDictionaryController {
     private static String actionDatas = "actionPolicyDictionaryDatas";
 
     @Autowired
-    public ActionPolicyDictionaryController(CommonClassDao commonClassDao){
+    public ActionPolicyDictionaryController(CommonClassDao commonClassDao) {
         ActionPolicyDictionaryController.commonClassDao = commonClassDao;
     }
 
-    public void setCommonClassDao(CommonClassDao commonClassDao){
+    public void setCommonClassDao(CommonClassDao commonClassDao) {
         ActionPolicyDictionaryController.commonClassDao = commonClassDao;
     }
 
-    public ActionPolicyDictionaryController(){
+    public ActionPolicyDictionaryController() {
         super();
     }
 
-    private DictionaryUtils getDictionaryUtilsInstance(){
+    private DictionaryUtils getDictionaryUtilsInstance() {
         return DictionaryUtils.getDictionaryUtils();
     }
 
-    @RequestMapping(value={"/get_ActionPolicyDictDataByName"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-    public void getActionEntitybyName(HttpServletResponse response){
+    @RequestMapping(
+            value = {"/get_ActionPolicyDictDataByName"},
+            method = {RequestMethod.GET},
+            produces = MediaType.APPLICATION_JSON_VALUE)
+    public void getActionEntitybyName(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.getDataByEntity(response, actionDatas, attributeName, ActionPolicyDict.class);
     }
 
-    @RequestMapping(value={"/get_ActionPolicyDictData"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-    public void getActionPolicyDictionaryEntityData(HttpServletResponse response){
+    @RequestMapping(
+            value = {"/get_ActionPolicyDictData"},
+            method = {RequestMethod.GET},
+            produces = MediaType.APPLICATION_JSON_VALUE)
+    public void getActionPolicyDictionaryEntityData(HttpServletResponse response) {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.getData(response, actionDatas, ActionPolicyDict.class);
     }
 
-    @RequestMapping(value={"/action_dictionary/save_ActionDict"}, method={RequestMethod.POST})
-    public ModelAndView saveActionPolicyDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+    @RequestMapping(value = {"/action_dictionary/save_ActionDict"}, method = {RequestMethod.POST})
+    public ModelAndView saveActionPolicyDictionary(HttpServletRequest request, HttpServletResponse response)
+            throws IOException {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         try {
             boolean fromAPI = utils.isRequestFromAPI(request);
@@ -90,63 +97,68 @@ public class ActionPolicyDictionaryController {
             ActionPolicyDict actionPolicyDict = null;
             ActionAdapter adapter = null;
             String userId = null;
-            if(fromAPI){
+            if (fromAPI) {
                 actionPolicyDict = mapper.readValue(root.get("dictionaryFields").toString(), ActionPolicyDict.class);
                 adapter = mapper.readValue(root.get("dictionaryFields").toString(), ActionAdapter.class);
                 userId = "API";
-            }else{
-                actionPolicyDict = mapper.readValue(root.get("actionPolicyDictionaryData").toString(), ActionPolicyDict.class);
+            } else {
+                actionPolicyDict =
+                        mapper.readValue(root.get("actionPolicyDictionaryData").toString(), ActionPolicyDict.class);
                 adapter = mapper.readValue(root.get("actionPolicyDictionaryData").toString(), ActionAdapter.class);
                 userId = root.get("userid").textValue();
             }
             UserInfo userInfo = utils.getUserInfo(userId);
 
-            List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(actionPolicyDict.getAttributeName(), attributeName, ActionPolicyDict.class);
+            List<Object> duplicateData = commonClassDao.checkDuplicateEntry(actionPolicyDict.getAttributeName(),
+                    attributeName, ActionPolicyDict.class);
             boolean duplicateflag = false;
-            if(!duplicateData.isEmpty()){
+            if (!duplicateData.isEmpty()) {
                 ActionPolicyDict data = (ActionPolicyDict) duplicateData.get(0);
-                if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){
+                if (request.getParameter(operation) != null && "update".equals(request.getParameter(operation))) {
                     actionPolicyDict.setId(data.getId());
-                }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) ||
-                        (request.getParameter(operation) == null && (data.getId() != actionPolicyDict.getId()))){
+                } else if ((request.getParameter(operation) != null
+                        && !"update".equals(request.getParameter(operation)))
+                        || (request.getParameter(operation) == null && (data.getId() != actionPolicyDict.getId()))) {
                     duplicateflag = true;
                 }
             }
             actionPolicyDict.setHeader(utils.appendKeyValue(adapter.getHeaders(), ":", "="));
 
             String responseString = null;
-            if(!duplicateflag){
+            if (!duplicateflag) {
                 actionPolicyDict.setUserModifiedBy(userInfo);
-                if(actionPolicyDict.getId() == 0){
+                if (actionPolicyDict.getId() == 0) {
                     actionPolicyDict.setUserCreatedBy(userInfo);
                     commonClassDao.save(actionPolicyDict);
-                }else{
+                } else {
                     actionPolicyDict.setModifiedDate(new Date());
                     commonClassDao.update(actionPolicyDict);
                 }
                 responseString = mapper.writeValueAsString(commonClassDao.getData(ActionPolicyDict.class));
-            }else{
+            } else {
                 responseString = "Duplicate";
             }
-            if(fromAPI){
+            if (fromAPI) {
                 return utils.getResultForApi(responseString);
-            }else{
+            } else {
                 utils.setResponseData(response, actionDatas, responseString);
             }
-        }catch(Exception e){
+        } catch (Exception e) {
             utils.setErrorResponseData(response, e);
         }
         return null;
     }
 
-    @RequestMapping(value={"/action_dictionary/remove_actionPolicyDict"}, method={RequestMethod.POST})
-    public void removeActionPolicyDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    @RequestMapping(value = {"/action_dictionary/remove_actionPolicyDict"}, method = {RequestMethod.POST})
+    public void removeActionPolicyDictionary(HttpServletRequest request, HttpServletResponse response)
+            throws IOException {
         DictionaryUtils utils = getDictionaryUtilsInstance();
         utils.removeData(request, response, actionDatas, ActionPolicyDict.class);
     }
 }
 
-class ActionAdapter{
+
+class ActionAdapter {
     private List<Object> headers;
 
     public List<Object> getHeaders() {