From 6ed1d666ce2d0e4173ba15100b18918dcbb208ab Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <daniel.gerhardt@mni.thm.de>
Date: Sun, 25 May 2014 16:01:50 +0200
Subject: [PATCH] Removed keyword parameter for feedback in Socket.IO
implementation
---
.../de/thm/arsnova/socket/ARSnovaSocketIOServer.java | 11 ++++-------
.../java/de/thm/arsnova/socket/message/Feedback.java | 11 +----------
2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
index 7fbb17ae..85ebf9d7 100644
--- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
+++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
@@ -100,15 +100,12 @@ public class ARSnovaSocketIOServer {
server.addEventListener("setFeedback", Feedback.class, new DataListener<Feedback>() {
@Override
public void onData(SocketIOClient client, Feedback data, AckRequest ackSender) {
- /**
- * do a check if user is in the session, for which he would give
- * a feedback
- */
User u = userService.getUser2SocketId(client.getSessionId());
- if (u == null || !userService.isUserInSession(u, data.getSessionkey())) {
- return;
+ String sessionKey = userService.getSessionForUser(u.getUsername());
+ LOGGER.debug("Feedback recieved: {}", new Object[] {u, sessionKey, data.getValue()});
+ if (null != sessionKey) {
+ feedbackService.saveFeedback(sessionKey, data.getValue(), u);
}
- feedbackService.saveFeedback(data.getSessionkey(), data.getValue(), u);
}
});
diff --git a/src/main/java/de/thm/arsnova/socket/message/Feedback.java b/src/main/java/de/thm/arsnova/socket/message/Feedback.java
index 8fdff90a..2168e8d5 100644
--- a/src/main/java/de/thm/arsnova/socket/message/Feedback.java
+++ b/src/main/java/de/thm/arsnova/socket/message/Feedback.java
@@ -3,15 +3,6 @@ package de.thm.arsnova.socket.message;
public class Feedback {
private int value;
- private String sessionkey;
-
- public String getSessionkey() {
- return sessionkey;
- }
-
- public void setSessionkey(String keyword) {
- this.sessionkey = keyword;
- }
public int getValue() {
return value;
@@ -23,6 +14,6 @@ public class Feedback {
@Override
public String toString() {
- return "Feedback, sessionkey: " + sessionkey + ", value: " + value;
+ return "Feedback, value: " + value;
}
}
--
GitLab