From bae29b7f5223cf9f0f4bedc21df72b17d9bdd34b Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Mon, 3 Nov 2014 13:49:43 +0100
Subject: [PATCH] Domain object refactoring
---
.../de/thm/arsnova/services/FeedbackService.java | 2 +-
.../thm/arsnova/socket/ARSnovaSocketIOServer.java | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/services/FeedbackService.java b/src/main/java/de/thm/arsnova/services/FeedbackService.java
index 4df29c7d..3011fb64 100644
--- a/src/main/java/de/thm/arsnova/services/FeedbackService.java
+++ b/src/main/java/de/thm/arsnova/services/FeedbackService.java
@@ -98,7 +98,7 @@ public class FeedbackService implements IFeedbackService {
for (Map.Entry<User, Set<Session>> entry : affectedSessionsOfUsers.entrySet()) {
final User user = entry.getKey();
final Set<Session> arsSessions = entry.getValue();
- server.reportDeletedFeedback(user.getUsername(), arsSessions);
+ server.reportDeletedFeedback(user, arsSessions);
}
// For each session that has deleted feedback, send the new feedback to all clients
for (Session session : deletedFeedbackOfUsersInSession.keySet()) {
diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
index aada6b73..36102b49 100644
--- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
+++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
@@ -225,8 +225,8 @@ public class ARSnovaSocketIOServer {
this.useSSL = useSSL;
}
- public void reportDeletedFeedback(final String username, final Set<de.thm.arsnova.entities.Session> arsSessions) {
- final List<UUID> connectionIds = findConnectionIdForUser(username);
+ public void reportDeletedFeedback(final User user, final Set<de.thm.arsnova.entities.Session> arsSessions) {
+ final List<UUID> connectionIds = findConnectionIdForUser(user);
if (connectionIds.isEmpty()) {
return;
}
@@ -244,11 +244,13 @@ public class ARSnovaSocketIOServer {
}
}
- private List<UUID> findConnectionIdForUser(final String username) {
+ private List<UUID> findConnectionIdForUser(final User user) {
final List<UUID> result = new ArrayList<UUID>();
for (final Entry<UUID, User> e : userService.socketId2User()) {
- if (e.getValue().getUsername().equals(username)) {
- result.add(e.getKey());
+ final UUID someUsersConnectionId = e.getKey();
+ final User someUser = e.getValue();
+ if (someUser.equals(user)) {
+ result.add(someUsersConnectionId);
}
}
return result;
@@ -293,7 +295,7 @@ public class ARSnovaSocketIOServer {
} catch (final NoContentException e) {
averageFeedback = null;
}
- final List<UUID> connectionIds = findConnectionIdForUser(user.getUsername());
+ final List<UUID> connectionIds = findConnectionIdForUser(user);
if (connectionIds.isEmpty()) {
return;
}
--
GitLab