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=346b95aff1072a29d450c6957a4d93fe6b4f2f16;hb=023280727ac52e777b4128d726e212c9e8abd435;hp=3b88f847216f574b71da56072274dbcd39ba2c43;hpb=6f2b3f2dd0e80895acd0f77aa5784e717be33696;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 3b88f8472..346b95aff 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
@@ -34,8 +34,10 @@ 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.policy.utils.PolicyUtils;
+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 +56,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 +93,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");
@@ -113,7 +119,7 @@ public class AdminTabController extends RestrictedBaseController{
 			response.setCharacterEncoding("UTF-8");
 			request.setCharacterEncoding("UTF-8");
 			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
+			out.write(PolicyUtils.CATCH_EXCEPTION);
 		}
 		return null;
 	}