Merge "Included Policy GUI Enhancements and validations"

[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 3b88f84..4893522 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
@@ -34,8 +34,9 @@ import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.rest.dao.CommonClassDao;
 import org.onap.policy.rest.jpa.GlobalRoleSettings;
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-import org.openecomp.portalsdk.core.web.support.JsonMessage;
+import org.onap.portalsdk.core.controller.RestrictedBaseController;
+import org.onap.portalsdk.core.web.support.JsonMessage;
+import org.onap.portalsdk.core.web.support.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
@@ -54,23 +55,23 @@ public class AdminTabController extends RestrictedBaseController{
        
        private static CommonClassDao commonClassDao;
        
-       public static CommonClassDao getCommonClassDao() {
-               return commonClassDao;
+        public AdminTabController() {
+               //default constructor
        }
 
-       public static void setCommonClassDao(CommonClassDao commonClassDao) {
-               AdminTabController.commonClassDao = commonClassDao;
-       }
-       
        @Autowired
        private AdminTabController(CommonClassDao commonClassDao){
                AdminTabController.commonClassDao = commonClassDao;
        }
-               
-       public AdminTabController() {
-               //default constructor
+
+        public static CommonClassDao getCommonClassDao() {
+               return commonClassDao;
        }
 
+       public static void setCommonClassDao(CommonClassDao commonClassDao) {
+               AdminTabController.commonClassDao = commonClassDao;
+       }
+       
        @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{
@@ -91,6 +92,10 @@ public class AdminTabController extends RestrictedBaseController{
                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*****************************************");
+                       LOGGER.info("UserId:  " + userId);
+                       LOGGER.info("*********************************************************************************************************************************");
                        JsonNode root = mapper.readTree(request.getReader());
                        GlobalRoleSettings globalRole = mapper.readValue(root.get("lockdowndata").toString(), GlobalRoleSettings.class);
                        globalRole.setRole("super-admin");