diff --git a/src/main/java/de/thm/arsnova/FeedbackStorage.java b/src/main/java/de/thm/arsnova/FeedbackStorage.java index dd46e15ef7ff372f3de6cfde4c25eac96d7d72b3..dcdd11b845d1301489dee7d6f08e4e47baeaddf1 100644 --- a/src/main/java/de/thm/arsnova/FeedbackStorage.java +++ b/src/main/java/de/thm/arsnova/FeedbackStorage.java @@ -40,7 +40,7 @@ public class FeedbackStorage { private IDatabaseDao dao; public FeedbackStorage(IDatabaseDao newDao) { - this.data = new ConcurrentHashMap<String, Map<String,FeedbackStorageObject>>(); + this.data = new ConcurrentHashMap<String, Map<String, FeedbackStorageObject>>(); this.dao = newDao; } diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java index 8c215c599fcaea3ecccb1e52338e125a72074075..fa3b627f64a68ff157a0513bc2ac99514a3e2855 100644 --- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java +++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java @@ -1023,8 +1023,7 @@ public class CouchDBDao implements IDatabaseDao { sb.append("]"); try { this.setKeys(URLEncoder.encode(sb.toString(), "UTF-8")); - } - catch (UnsupportedEncodingException e) { + } catch (UnsupportedEncodingException e) { LOGGER.error("Error while encoding course ID keys", e); } } diff --git a/src/main/java/de/thm/arsnova/entities/LoggedIn.java b/src/main/java/de/thm/arsnova/entities/LoggedIn.java index f44650438b17212e99a9183dcd038155ed714aee..1c4b91719ebaf41eb769b65fbb016a458d120555 100644 --- a/src/main/java/de/thm/arsnova/entities/LoggedIn.java +++ b/src/main/java/de/thm/arsnova/entities/LoggedIn.java @@ -122,7 +122,7 @@ public class LoggedIn { } public boolean hasConflicts() { - return ! (_conflicts == null || _conflicts.isEmpty()); + return !(_conflicts == null || _conflicts.isEmpty()); } @Override @@ -132,4 +132,4 @@ public class LoggedIn { + ", timestamp=" + timestamp + ", visitedSessions=" + visitedSessions + "]"; } -} \ No newline at end of file +} diff --git a/src/main/java/de/thm/arsnova/events/Publisher.java b/src/main/java/de/thm/arsnova/events/Publisher.java index c8906725eeaa6280d3a103feefa6d15ce41a8f45..ac5b64fa218f3668198e2c1ac74c64bd22de8aa3 100644 --- a/src/main/java/de/thm/arsnova/events/Publisher.java +++ b/src/main/java/de/thm/arsnova/events/Publisher.java @@ -1,6 +1,5 @@ package de.thm.arsnova.events; -import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; @@ -13,7 +12,7 @@ public class Publisher implements ApplicationContextAware { private ApplicationContext context; @Override - public void setApplicationContext(ApplicationContext c) throws BeansException { + public void setApplicationContext(ApplicationContext c) { this.context = c; } diff --git a/src/main/java/de/thm/arsnova/services/UserSessionService.java b/src/main/java/de/thm/arsnova/services/UserSessionService.java index df3110cd50221cba01a1dc79b7ddb1951271091a..170030f67b8e6076203f9b2f2f780be73f8f45e3 100644 --- a/src/main/java/de/thm/arsnova/services/UserSessionService.java +++ b/src/main/java/de/thm/arsnova/services/UserSessionService.java @@ -30,4 +30,4 @@ public interface UserSessionService { boolean isAuthenticated(); void sendEventViaWebSocket(ARSnovaSocketIOServer server, ARSnovaEvent event); -} \ No newline at end of file +} diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java index f9d41fcd95e3c1052b9ffc906ecb69424a3cc0bf..aba71f925a0086d5998967c9f9b3fc4cb4feaff6 100644 --- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java +++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java @@ -109,7 +109,7 @@ public class ARSnovaSocketIOServer { * a feedback */ User u = userService.getUser2SocketId(client.getSessionId()); - if (u == null || ! userService.isUserInSession(u, data.getSessionkey())) { + if (u == null || !userService.isUserInSession(u, data.getSessionkey())) { return; } feedbackService.saveFeedback(data.getSessionkey(), data.getValue(), u);