Index: lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java =================================================================== diff -u -r794ad631f0d50966459d718ddc3f47ec7d1b3447 -rcd4af70336301a4c551cf28afbfc5534e3e6e7c9 --- lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java (.../CommandWebsocketServer.java) (revision 794ad631f0d50966459d718ddc3f47ec7d1b3447) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java (.../CommandWebsocketServer.java) (revision cd4af70336301a4c551cf28afbfc5534e3e6e7c9) @@ -142,7 +142,7 @@ * Removes Learner websocket from the collection. */ @OnClose - public void unregisterUser(Session session, CloseReason reason) { + public void unregisterUser(Session session) { String login = session.getUserPrincipal().getName(); if (login == null) { return; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rcd4af70336301a4c551cf28afbfc5534e3e6e7c9 --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java (.../KumaliveWebsocketServer.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java (.../KumaliveWebsocketServer.java) (revision cd4af70336301a4c551cf28afbfc5534e3e6e7c9) @@ -97,8 +97,8 @@ private static class KumalivePollDTO { private final Long pollId; private final ObjectNode pollJSON = JsonNodeFactory.instance.objectNode(); - private final List answerIds = new ArrayList(); - private final ArrayList> voters = new ArrayList>(); + private final List answerIds = new ArrayList<>(); + private final ArrayList> voters = new ArrayList<>(); private final Set voterLogins = ConcurrentHashMap.newKeySet(); private final ArrayNode votersJSON = JsonNodeFactory.instance.arrayNode(); private boolean finished = false; @@ -143,7 +143,7 @@ } @OnClose - public void unregisterUser(Session websocket, CloseReason reason) throws IOException { + public void unregisterUser(Session websocket) throws IOException { String login = websocket.getUserPrincipal().getName(); if (login == null) { return; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java =================================================================== diff -u -rc0afa34ef8004a73b35f396bfb30285043ebce31 -rcd4af70336301a4c551cf28afbfc5534e3e6e7c9 --- lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java (.../PresenceWebsocketServer.java) (revision c0afa34ef8004a73b35f396bfb30285043ebce31) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java (.../PresenceWebsocketServer.java) (revision cd4af70336301a4c551cf28afbfc5534e3e6e7c9) @@ -11,8 +11,6 @@ import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; -import javax.websocket.CloseReason; -import javax.websocket.CloseReason.CloseCodes; import javax.websocket.OnClose; import javax.websocket.OnMessage; import javax.websocket.OnOpen; @@ -278,7 +276,7 @@ * If there was something wrong with the connection, put it into logs. */ @OnClose - public void unregisterUser(Session websocket, CloseReason reason) { + public void unregisterUser(Session websocket) { Long lessonId = (Long) websocket.getUserProperties().get(AttributeNames.PARAM_LESSON_ID); Set lessonWebsockets = PresenceWebsocketServer.websockets.get(lessonId); Iterator sessionIterator = lessonWebsockets.iterator(); @@ -292,12 +290,7 @@ if (PresenceWebsocketServer.log.isDebugEnabled()) { PresenceWebsocketServer.log.debug("User " + websocket.getUserProperties().get(PARAM_NICKNAME) - + " left Presence Chat with lessonId: " + lessonId - + (!(reason.getCloseCode().equals(CloseCodes.GOING_AWAY) - || reason.getCloseCode().equals(CloseCodes.NORMAL_CLOSURE)) - ? ". Abnormal close. Code: " + reason.getCloseCode() + ". Reason: " - + reason.getReasonPhrase() - : "(unknown)")); + + " left Presence Chat with lessonId: " + lessonId); } } Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningWebsocketServer.java =================================================================== diff -u -r365a2c22199a5fe2b1e55e18cbf4b6d2596f202b -rcd4af70336301a4c551cf28afbfc5534e3e6e7c9 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningWebsocketServer.java (.../LearningWebsocketServer.java) (revision 365a2c22199a5fe2b1e55e18cbf4b6d2596f202b) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningWebsocketServer.java (.../LearningWebsocketServer.java) (revision cd4af70336301a4c551cf28afbfc5534e3e6e7c9) @@ -10,8 +10,6 @@ import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; -import javax.websocket.CloseReason; -import javax.websocket.CloseReason.CloseCodes; import javax.websocket.OnClose; import javax.websocket.OnMessage; import javax.websocket.OnOpen; @@ -302,7 +300,7 @@ * When user leaves the activity. */ @OnClose - public void unregisterUser(Session session, CloseReason reason) { + public void unregisterUser(Session session) { Long toolSessionId = Long .valueOf(session.getRequestParameterMap().get(AttributeNames.PARAM_TOOL_SESSION_ID).get(0)); Set sessionWebsockets = LearningWebsocketServer.websockets.get(toolSessionId); @@ -317,12 +315,7 @@ if (LearningWebsocketServer.log.isDebugEnabled()) { LearningWebsocketServer.log.debug( - "User " + session.getUserPrincipal().getName() + " left Chat with toolSessionId: " + toolSessionId - + (!(reason.getCloseCode().equals(CloseCodes.GOING_AWAY) - || reason.getCloseCode().equals(CloseCodes.NORMAL_CLOSURE)) - ? ". Abnormal close. Code: " + reason.getCloseCode() + ". Reason: " - + reason.getReasonPhrase() - : "")); + "User " + session.getUserPrincipal().getName() + " left Chat with toolSessionId: " + toolSessionId); } } Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningWebsocketServer.java =================================================================== diff -u -r639c5ec2598f0c148ceeb7d4bc8d7e9033dfccf3 -rcd4af70336301a4c551cf28afbfc5534e3e6e7c9 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningWebsocketServer.java (.../LearningWebsocketServer.java) (revision 639c5ec2598f0c148ceeb7d4bc8d7e9033dfccf3) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningWebsocketServer.java (.../LearningWebsocketServer.java) (revision cd4af70336301a4c551cf28afbfc5534e3e6e7c9) @@ -8,8 +8,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.websocket.CloseReason; -import javax.websocket.CloseReason.CloseCodes; import javax.websocket.OnClose; import javax.websocket.OnOpen; import javax.websocket.Session; @@ -66,7 +64,7 @@ LeaderselectionUser leader = LearningWebsocketServer.getLeaderService() .getSessionBySessionId(toolSessionId).getGroupLeader(); Long existingLeaderUid = leaders.get(toolSessionId); - + // check if a leader has been selected or it has changed if ((existingLeaderUid == null && leader != null) || (existingLeaderUid != null && (leader == null || !leader.getUid().equals(existingLeaderUid)))) { @@ -135,20 +133,15 @@ * When user leaves the activity. */ @OnClose - public void unregisterUser(Session websocket, CloseReason reason) { + public void unregisterUser(Session websocket) { Long toolSessionId = Long .valueOf(websocket.getRequestParameterMap().get(AttributeNames.PARAM_TOOL_SESSION_ID).get(0)); websockets.get(toolSessionId).remove(websocket); if (log.isDebugEnabled()) { // If there was something wrong with the connection, put it into logs. log.debug("User " + websocket.getUserPrincipal().getName() + " left Leader Selection with Tool Session ID: " - + toolSessionId - + (!(reason.getCloseCode().equals(CloseCodes.GOING_AWAY) - || reason.getCloseCode().equals(CloseCodes.NORMAL_CLOSURE)) - ? ". Abnormal close. Code: " + reason.getCloseCode() + ". Reason: " - + reason.getReasonPhrase() - : "")); + + toolSessionId); } } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningWebsocketServer.java =================================================================== diff -u -rf6e7035df9568b17d8f83273fc025fec8f624680 -rcd4af70336301a4c551cf28afbfc5534e3e6e7c9 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningWebsocketServer.java (.../LearningWebsocketServer.java) (revision f6e7035df9568b17d8f83273fc025fec8f624680) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningWebsocketServer.java (.../LearningWebsocketServer.java) (revision cd4af70336301a4c551cf28afbfc5534e3e6e7c9) @@ -8,8 +8,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.websocket.CloseReason; -import javax.websocket.CloseReason.CloseCodes; import javax.websocket.OnClose; import javax.websocket.OnMessage; import javax.websocket.OnOpen; @@ -259,20 +257,15 @@ * When user leaves the activity. */ @OnClose - public void unregisterUser(Session websocket, CloseReason reason) { + public void unregisterUser(Session websocket) { Long toolSessionId = Long .valueOf(websocket.getRequestParameterMap().get(AttributeNames.PARAM_TOOL_SESSION_ID).get(0)); LearningWebsocketServer.websockets.get(toolSessionId).remove(websocket); if (LearningWebsocketServer.log.isDebugEnabled()) { // If there was something wrong with the connection, put it into logs. LearningWebsocketServer.log.debug("User " + websocket.getUserPrincipal().getName() - + " left Mindmap with Tool Session ID: " + toolSessionId - + (!(reason.getCloseCode().equals(CloseCodes.GOING_AWAY) - || reason.getCloseCode().equals(CloseCodes.NORMAL_CLOSURE)) - ? ". Abnormal close. Code: " + reason.getCloseCode() + ". Reason: " - + reason.getReasonPhrase() - : "")); + + " left Mindmap with Tool Session ID: " + toolSessionId); } } Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/controller/LearningWebsocketServer.java =================================================================== diff -u -r4ac3a79aaf6832ad187d8f25cb5f9857371191be -rcd4af70336301a4c551cf28afbfc5534e3e6e7c9 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/controller/LearningWebsocketServer.java (.../LearningWebsocketServer.java) (revision 4ac3a79aaf6832ad187d8f25cb5f9857371191be) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/controller/LearningWebsocketServer.java (.../LearningWebsocketServer.java) (revision cd4af70336301a4c551cf28afbfc5534e3e6e7c9) @@ -9,8 +9,6 @@ import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; -import javax.websocket.CloseReason; -import javax.websocket.CloseReason.CloseCodes; import javax.websocket.OnClose; import javax.websocket.OnMessage; import javax.websocket.OnOpen; @@ -250,20 +248,15 @@ * When user leaves the activity. */ @OnClose - public void unregisterUser(Session websocket, CloseReason reason) { + public void unregisterUser(Session websocket) { Long toolSessionId = Long .valueOf(websocket.getRequestParameterMap().get(AttributeNames.PARAM_TOOL_SESSION_ID).get(0)); LearningWebsocketServer.websockets.get(toolSessionId).remove(websocket); if (LearningWebsocketServer.log.isDebugEnabled()) { // If there was something wrong with the connection, put it into logs. LearningWebsocketServer.log.debug("User " + websocket.getUserPrincipal().getName() - + " left Scribe with Tool Session ID: " + toolSessionId - + (!(reason.getCloseCode().equals(CloseCodes.GOING_AWAY) - || reason.getCloseCode().equals(CloseCodes.NORMAL_CLOSURE)) - ? ". Abnormal close. Code: " + reason.getCloseCode() + ". Reason: " - + reason.getReasonPhrase() - : "")); + + " left Scribe with Tool Session ID: " + toolSessionId); } }