X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontroller%2FAdminTabController.java;h=139b2b87f164180cb9f1655de2a7d7501d215e99;hb=refs%2Fchanges%2F84%2F98384%2F3;hp=0ab2660713bbb5bed6fcda058398a44123c18b3f;hpb=f36e53a3637e1204a42491ec0eeed7b3c763f681;p=policy%2Fengine.git

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 0ab266071..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
@@ -26,7 +26,6 @@ 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;
 
@@ -53,7 +52,6 @@ import org.springframework.web.servlet.ModelAndView;
 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;
 
@@ -108,6 +106,8 @@ public class AdminTabController extends RestrictedBaseController {
             method = {org.springframework.web.bind.annotation.RequestMethod.POST})
     public ModelAndView saveAdminTabLockdownValue(HttpServletRequest request, HttpServletResponse response)
             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);
@@ -123,20 +123,14 @@ public class AdminTabController extends RestrictedBaseController {
             globalRole.setRole("super-admin");
             commonClassDao.update(globalRole);
 
-            response.setCharacterEncoding(CHARACTER_ENCODING);
-            response.setContentType("application / json");
-            request.setCharacterEncoding(CHARACTER_ENCODING);
+            response.setContentType(PolicyUtils.APPLICATION_JSON);
 
             String responseString = mapper.writeValueAsString(commonClassDao.getData(GlobalRoleSettings.class));
 
             response.getWriter().write(new JSONObject("{descriptiveScopeDictionaryDatas: " + responseString
                     + "}").toString());
-
-            return null;
         } catch (Exception e) {
             LOGGER.error("Exception Occured" + e);
-            response.setCharacterEncoding(CHARACTER_ENCODING);
-            request.setCharacterEncoding(CHARACTER_ENCODING);
             response.getWriter().write(PolicyUtils.CATCH_EXCEPTION);
         }
         return null;