1 files changed, 39 insertions, 32 deletions

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AdminTabController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AdminTabController.java
index fc25e29f0..139b2b87f 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AdminTabController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AdminTabController.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2019 Bell Canada
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,8 +21,11 @@
 
 package org.onap.policy.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.PrintWriter;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -44,21 +47,16 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 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
 @RequestMapping({"/"})
 public class AdminTabController extends RestrictedBaseController {
 
     private static final Logger LOGGER = FlexLogger.getLogger(AdminTabController.class);
-    private static final String CHARACTER_ENCODING = "UTF-8";
 
     private static CommonClassDao commonClassDao;
 
     public AdminTabController() {
-        //default constructor
+        // default constructor
     }
 
     @Autowired
@@ -74,57 +72,66 @@ public class AdminTabController extends RestrictedBaseController {
         AdminTabController.commonClassDao = commonClassDao;
     }
 
-    @RequestMapping(value = {"/get_LockDownData"}, method = {
-        org.springframework.web.bind.annotation.RequestMethod.GET}, produces = MediaType.APPLICATION_JSON_VALUE)
+    /**
+     * getAdminTabEntityData.
+     *
+     * @param request HttpServletRequest
+     * @param response HttpServletResponse
+     */
+    @RequestMapping(
+            value = {"/get_LockDownData"},
+            method = {org.springframework.web.bind.annotation.RequestMethod.GET},
+            produces = MediaType.APPLICATION_JSON_VALUE)
     public void getAdminTabEntityData(HttpServletRequest request, HttpServletResponse response) {
         try {
             Map<String, Object> model = new HashMap<>();
             ObjectMapper mapper = new ObjectMapper();
             model.put("lockdowndata", mapper.writeValueAsString(commonClassDao.getData(GlobalRoleSettings.class)));
-            JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-            JSONObject j = new JSONObject(msg);
-            response.getWriter().write(j.toString());
+            response.getWriter().write(new JSONObject(new JsonMessage(mapper.writeValueAsString(model))).toString());
         } catch (Exception e) {
             LOGGER.error("Exception Occured" + e);
         }
     }
 
-    @RequestMapping(value = {"/adminTabController/save_LockDownValue.htm"}, method = {
-        org.springframework.web.bind.annotation.RequestMethod.POST})
+    /**
+     * saveAdminTabLockdownValue.
+     *
+     * @param request HttpServletRequest
+     * @param response HttpServletResponse
+     * @return ModelAndView object
+     * @throws IOException IOException
+     */
+    @RequestMapping(
+            value = {"/adminTabController/save_LockDownValue.htm"},
+            method = {org.springframework.web.bind.annotation.RequestMethod.POST})
     public ModelAndView saveAdminTabLockdownValue(HttpServletRequest request, HttpServletResponse response)
-        throws IOException {
+            throws IOException {
+        response.setCharacterEncoding(PolicyUtils.CHARACTER_ENCODING);
+        request.setCharacterEncoding(PolicyUtils.CHARACTER_ENCODING);
         try {
             ObjectMapper mapper = new ObjectMapper();
             mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
             String userId = UserUtils.getUserSession(request).getOrgUserId();
             LOGGER.info(
-                "****************************************Logging UserID for Application Lockdown Function*****************************************");
+                    "********************Logging UserID for Application Lockdown Function**************************");
             LOGGER.info("UserId:  " + userId);
             LOGGER.info(
-                "*********************************************************************************************************************************");
+                    "**********************************************************************************************");
             JsonNode root = mapper.readTree(request.getReader());
-            GlobalRoleSettings globalRole = mapper
-                .readValue(root.get("lockdowndata").toString(), GlobalRoleSettings.class);
+            GlobalRoleSettings globalRole =
+                    mapper.readValue(root.get("lockdowndata").toString(), GlobalRoleSettings.class);
             globalRole.setRole("super-admin");
             commonClassDao.update(globalRole);
 
-            response.setCharacterEncoding(CHARACTER_ENCODING);
-            response.setContentType("application / json");
-            request.setCharacterEncoding(CHARACTER_ENCODING);
+            response.setContentType(PolicyUtils.APPLICATION_JSON);
 
-            PrintWriter out = response.getWriter();
             String responseString = mapper.writeValueAsString(commonClassDao.getData(GlobalRoleSettings.class));
-            JSONObject j = new JSONObject("{descriptiveScopeDictionaryDatas: " + responseString + "}");
-
-            out.write(j.toString());
 
-            return null;
+            response.getWriter().write(new JSONObject("{descriptiveScopeDictionaryDatas: " + responseString
+                    + "}").toString());
         } catch (Exception e) {
             LOGGER.error("Exception Occured" + e);
-            response.setCharacterEncoding(CHARACTER_ENCODING);
-            request.setCharacterEncoding(CHARACTER_ENCODING);
-            PrintWriter out = response.getWriter();
-            out.write(PolicyUtils.CATCH_EXCEPTION);
+            response.getWriter().write(PolicyUtils.CATCH_EXCEPTION);
         }
         return null;
     }