More sonar cleanup and line consolidation

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

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyUserInfoController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyUserInfoController.java
index 96205c5..9cf6479 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyUserInfoController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyUserInfoController.java
@@ -2,14 +2,15 @@
  * ============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");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +18,11 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.admin;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -35,28 +39,28 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 @Controller
 @RequestMapping("/")
-public class PolicyUserInfoController extends RestrictedBaseController{
-       
-       private static final Logger LOGGER      = FlexLogger.getLogger(PolicyUserInfoController.class);
-       
-       @RequestMapping(value="/get_PolicyUserInfo", method = RequestMethod.GET)
-       public void getPolicyUserInfo(HttpServletRequest request, HttpServletResponse response){
-               JsonMessage msg = null;
-               try {
-                       String userId =  UserUtils.getUserSession(request).getOrgUserId();
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("userid", userId);
-                       msg = new JsonMessage(mapper.writeValueAsString(model));
-                       JSONObject j = new JSONObject(msg);
-                       response.getWriter().write(j.toString());
-               } catch (Exception e) {
-                       LOGGER.error("Exception Occured"+e);
-               }
-       }
+public class PolicyUserInfoController extends RestrictedBaseController {
+
+    private static final Logger LOGGER = FlexLogger.getLogger(PolicyUserInfoController.class);
 
+    /**
+     * getPolicyUserInfo - fills the HTTP response with user information.
+     *
+     * @param request HttpServletRequest
+     * @param response HttpServletResponse
+     */
+    @RequestMapping(value = "/get_PolicyUserInfo", method = RequestMethod.GET)
+    public void getPolicyUserInfo(HttpServletRequest request, HttpServletResponse response) {
+        try {
+            String userId = UserUtils.getUserSession(request).getOrgUserId();
+            Map<String, Object> model = new HashMap<>();
+            model.put("userid", userId);
+            response.getWriter().write(new JSONObject(new JsonMessage(
+                    new ObjectMapper().writeValueAsString(model))).toString());
+        } catch (Exception e) {
+            LOGGER.error("Exception Occurred" + e);
+        }
+    }
 }