summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-app-common/src
diff options
context:
space:
mode:
Diffstat (limited to 'ecomp-sdk/epsdk-app-common/src')
-rw-r--r--ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UsageListController.java12
-rw-r--r--ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CollaborationController.java4
2 files changed, 9 insertions, 7 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);
diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CollaborationController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CollaborationController.java
index 93a6f74f..18cd6a6a 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CollaborationController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CollaborationController.java
@@ -56,7 +56,7 @@ public class CollaborationController extends RestrictedBaseController{
@RequestMapping(value = {"/collaboration" }, method = RequestMethod.GET)
public ModelAndView view(HttpServletRequest request) {
- Map<String, Object> model = new HashMap<String, Object>();
+ Map<String, Object> model = new HashMap<>();
User user = UserUtils.getUserSession(request);
model.put("name",(user.getFirstName() + " " + (user.getLastName() != null? user.getLastName().substring(0,1): "" )));
@@ -64,7 +64,7 @@ public class CollaborationController extends RestrictedBaseController{
}
@RequestMapping(value = {"/openCollaboration" }, method = RequestMethod.GET)
public ModelAndView openCollaboration(HttpServletRequest request) {
- Map<String, Object> model = new HashMap<String, Object>();
+ Map<String, Object> model = new HashMap<>();
User user = UserUtils.getUserSession(request);
model.put("name",(user.getFirstName() + " " + (user.getLastName() != null? user.getLastName().substring(0,1): "" )));