Consolidate PolicyRestAdapter setup

[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / controller / AdminTabController.java

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 e919096..139b2b8 100644 (file)
--- 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
@@ -52,7 +52,6 @@ import org.springframework.web.servlet.ModelAndView;
 public class AdminTabController extends RestrictedBaseController {
 
     private static final Logger LOGGER = FlexLogger.getLogger(AdminTabController.class);
 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;
 
 
     private static CommonClassDao commonClassDao;
 


@@ -107,8 +106,8 @@ public class AdminTabController extends RestrictedBaseController {
             method = {org.springframework.web.bind.annotation.RequestMethod.POST})
     public ModelAndView saveAdminTabLockdownValue(HttpServletRequest request, HttpServletResponse response)
             throws IOException {
             method = {org.springframework.web.bind.annotation.RequestMethod.POST})
     public ModelAndView saveAdminTabLockdownValue(HttpServletRequest request, HttpServletResponse response)
             throws IOException {

-        response.setCharacterEncoding(CHARACTER_ENCODING);
-        request.setCharacterEncoding(CHARACTER_ENCODING);
+        response.setCharacterEncoding(PolicyUtils.CHARACTER_ENCODING);
+        request.setCharacterEncoding(PolicyUtils.CHARACTER_ENCODING);

         try {
             ObjectMapper mapper = new ObjectMapper();
             mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         try {
             ObjectMapper mapper = new ObjectMapper();
             mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);


@@ -124,7 +123,7 @@ public class AdminTabController extends RestrictedBaseController {
             globalRole.setRole("super-admin");
             commonClassDao.update(globalRole);
 
             globalRole.setRole("super-admin");
             commonClassDao.update(globalRole);
 

-            response.setContentType("application / json");
+            response.setContentType(PolicyUtils.APPLICATION_JSON);

 
             String responseString = mapper.writeValueAsString(commonClassDao.getData(GlobalRoleSettings.class));
 
 
             String responseString = mapper.writeValueAsString(commonClassDao.getData(GlobalRoleSettings.class));