Fix sonar issues in UsageListController

Change-Id: Ia6743652884bc505e7d8694b270bc9b31c14b7c8
Issue-ID: PORTAL-523
Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>

1 files changed, 7 insertions, 5 deletions

diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UsageListController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UsageListController.java
index 04c1f2bc..fabc06bf 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UsageListController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UsageListController.java
@@ -65,6 +65,8 @@ public class UsageListController extends RestrictedBaseController {
 
 	private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(UsageListController.class);
 
+	private static final String ACTIVE_USERS = "activeUsers";
+
 	private void addUsers2jsonArray(JSONArray ja,HashMap activeUsers,String httpSessionId)
   {
     List<UserRowBean> rows = UsageUtils.getActiveUsers(activeUsers);
@@ -96,10 +98,10 @@ public class UsageListController extends RestrictedBaseController {
 		Map<String, Object> model = new HashMap<>();
 
 		HttpSession httpSession = request.getSession();
-		HashMap activeUsers = (HashMap) httpSession.getServletContext().getAttribute("activeUsers");
+		HashMap activeUsers = (HashMap) httpSession.getServletContext().getAttribute(ACTIVE_USERS);
 		if (activeUsers.size() == 0) {
 			activeUsers.put(httpSession.getId(), httpSession);
-			httpSession.getServletContext().setAttribute("activeUsers", activeUsers);
+			httpSession.getServletContext().setAttribute(ACTIVE_USERS, activeUsers);
 		}
 
 		JSONArray ja = new JSONArray();
@@ -119,10 +121,10 @@ public class UsageListController extends RestrictedBaseController {
 	public void getUsageList(HttpServletRequest request, HttpServletResponse response) {
 
 		HttpSession httpSession = request.getSession();
-		HashMap activeUsers = (HashMap) httpSession.getServletContext().getAttribute("activeUsers");
+		HashMap activeUsers = (HashMap) httpSession.getServletContext().getAttribute(ACTIVE_USERS);
 		if (activeUsers.size() == 0) {
 			activeUsers.put(httpSession.getId(), httpSession);
-			httpSession.getServletContext().setAttribute("activeUsers", activeUsers);
+			httpSession.getServletContext().setAttribute(ACTIVE_USERS, activeUsers);
 		}
 		JSONArray ja = new JSONArray();
 		try {
@@ -144,7 +146,7 @@ public class UsageListController extends RestrictedBaseController {
 	@SuppressWarnings("rawtypes")
 	@RequestMapping(value = { "/usage_list/removeSession" }, method = RequestMethod.GET)
 	public void removeSession(HttpServletRequest request, HttpServletResponse response) throws IOException {
-		HashMap activeUsers = (HashMap) request.getSession().getServletContext().getAttribute("activeUsers");
+		HashMap activeUsers = (HashMap) request.getSession().getServletContext().getAttribute(ACTIVE_USERS);
 		UserRowBean data = new UserRowBean();
 		data.setSessionId(request.getParameter("deleteSessionId"));
 		UsageUtils.getActiveUsersAfterDelete(activeUsers, data);