diff --git a/src/main/java/de/thm/arsnova/controller/CourseController.java b/src/main/java/de/thm/arsnova/controller/CourseController.java
index 94e06932590c0eabd9d4d7026c627c9e0189d20e..5192ecdf93fa365f1c56d65ea2f776fb8acd49b1 100644
--- a/src/main/java/de/thm/arsnova/controller/CourseController.java
+++ b/src/main/java/de/thm/arsnova/controller/CourseController.java
@@ -38,7 +38,6 @@ import de.thm.arsnova.connector.model.Course;
import de.thm.arsnova.connector.model.UserRole;
import de.thm.arsnova.exceptions.NotFoundException;
import de.thm.arsnova.exceptions.UnauthorizedException;
-import de.thm.arsnova.services.ISessionService;
import de.thm.arsnova.services.IUserService;
@Controller
@@ -53,13 +52,10 @@ public class CourseController extends AbstractController {
@Autowired
private IUserService userService;
- @Autowired
- private ISessionService sessionService;
-
@RequestMapping(value = "/mycourses", method = RequestMethod.GET)
@ResponseBody
public final List<Course> myCourses(
- @RequestParam(value="sortby", defaultValue="name") final String sortby
+ @RequestParam(value = "sortby", defaultValue = "name") final String sortby
) {
String username = userService.getCurrentUser().getUsername();
diff --git a/src/main/java/de/thm/arsnova/controller/LoginController.java b/src/main/java/de/thm/arsnova/controller/LoginController.java
index df53d1dbce07c220605c7e940dbec57f6f5caa77..cbe8cc954faf941895aef16e0ca3fc0b2b9c275d 100644
--- a/src/main/java/de/thm/arsnova/controller/LoginController.java
+++ b/src/main/java/de/thm/arsnova/controller/LoginController.java
@@ -60,6 +60,7 @@ import de.thm.arsnova.services.UserSessionService;
public class LoginController extends AbstractController {
private static final int MAX_USERNAME_LENGTH = 15;
+ private static final int MAX_GUESTHASH_LENGTH = 10;
@Autowired
private TwitterProvider twitterProvider;
@@ -126,7 +127,7 @@ public class LoginController extends AbstractController {
if (guestName != null && guestName.startsWith("Guest") && guestName.length() == MAX_USERNAME_LENGTH) {
username = guestName;
} else {
- username = "Guest" + Sha512DigestUtils.shaHex(request.getSession().getId()).substring(0, 10);
+ username = "Guest" + Sha512DigestUtils.shaHex(request.getSession().getId()).substring(0, MAX_GUESTHASH_LENGTH);
}
org.springframework.security.core.userdetails.User user =
new org.springframework.security.core.userdetails.User(
diff --git a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
index 72afe35aef7a11305700c3c69915b7c30fe3659e..4d9e600e5b0d9b3ce72fb586cf07b109bc9efebb 100644
--- a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
+++ b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
@@ -19,7 +19,6 @@
package de.thm.arsnova.dao;
-import java.io.IOException;
import java.util.List;
import de.thm.arsnova.connector.model.Course;
diff --git a/src/main/java/de/thm/arsnova/services/FeedbackService.java b/src/main/java/de/thm/arsnova/services/FeedbackService.java
index d022b219d12b553e8daa4c282af00588870fb875..f44a4d24e07aaa7d650c2137a8080f2be94376b1 100644
--- a/src/main/java/de/thm/arsnova/services/FeedbackService.java
+++ b/src/main/java/de/thm/arsnova/services/FeedbackService.java
@@ -132,14 +132,13 @@ public class FeedbackService implements IFeedbackService {
for (String session : allAffectedSessions) {
this.server.reportUpdatedFeedbackForSession(session);
}
-
}
@Override
public final Integer getMyFeedback(final String keyword, final User user) {
return this.databaseDao.getMyFeedback(keyword, user);
}
-
+
private static class FeedbackStorageObject {
private int value;
private Date timestamp;
@@ -156,7 +155,7 @@ public class FeedbackService implements IFeedbackService {
return timestamp;
}
}
-
+
private static class FeedbackStorage {
private Map<String, Map<String, FeedbackStorageObject>> data;
@@ -169,30 +168,29 @@ public class FeedbackService implements IFeedbackService {
int b = 0;
int c = 0;
int d = 0;
-
+
if (data.get(keyword) == null) {
return new Feedback(0, 0, 0, 0);
}
-
+
for (FeedbackStorageObject fso : data.get(keyword).values()) {
switch (fso.getValue()) {
- case 0:
+ case Feedback.FEEDBACK_FASTER:
a++;
break;
- case 1:
+ case Feedback.FEEDBACK_OK:
b++;
break;
- case 2:
+ case Feedback.FEEDBACK_SLOWER:
c++;
break;
- case 3:
+ case Feedback.FEEDBACK_AWAY:
d++;
break;
default:
break;
}
}
-
return new Feedback(a, b, c, d);
}
@@ -213,9 +211,9 @@ public class FeedbackService implements IFeedbackService {
private void cleanSessionFeedbackVotes(String keyword, int cleanupFeedbackDelay) {
final long timelimitInMillis = 60000 * (long) cleanupFeedbackDelay;
final long maxAllowedTimeInMillis = System.currentTimeMillis() - timelimitInMillis;
-
+
Map<String, FeedbackStorageObject> sessionFeedbacks = data.get(keyword);
-
+
for (Map.Entry<String, FeedbackStorageObject> entry : sessionFeedbacks.entrySet()) {
if (
entry.getValue().getTimestamp().getTime() < maxAllowedTimeInMillis
diff --git a/src/main/java/de/thm/arsnova/services/FoodService.java b/src/main/java/de/thm/arsnova/services/FoodService.java
index 46fcabe76f1bd236d9d58c81285362ce6c7bf748..e43906b4db08221f1386d28a574778b2ef2f193f 100644
--- a/src/main/java/de/thm/arsnova/services/FoodService.java
+++ b/src/main/java/de/thm/arsnova/services/FoodService.java
@@ -33,18 +33,18 @@ public class FoodService implements IFoodService {
@Autowired
private IDatabaseDao databaseDao;
-
+
public final void setDatabaseDao(IDatabaseDao databaseDao) {
this.databaseDao = databaseDao;
}
-
+
@Override
@Authenticated
public void vote(String menu) {
this.databaseDao.vote(menu);
}
-
+
@Override
public List<FoodVote> getFoodVote() {
return this.databaseDao.getFoodVote();
diff --git a/src/main/java/de/thm/arsnova/services/IUserService.java b/src/main/java/de/thm/arsnova/services/IUserService.java
index 8146edd11d648581425fbf833fbe32815c29b650..9016b6e5e55e6b03aada1aac8a031d02b265121c 100644
--- a/src/main/java/de/thm/arsnova/services/IUserService.java
+++ b/src/main/java/de/thm/arsnova/services/IUserService.java
@@ -19,7 +19,6 @@
package de.thm.arsnova.services;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index b1efb373be88e396240eec04d50eae175ab247aa..78b848cbd76e4bfa0ba82863a8d0191116c2cc4f 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -19,7 +19,6 @@
package de.thm.arsnova.services;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
diff --git a/src/main/java/de/thm/arsnova/services/StatisticsService.java b/src/main/java/de/thm/arsnova/services/StatisticsService.java
index 1509e9e48c591e514973f4971ac6f96956ddca60..86d155ca00f5e4cca0ced91173ba4c45d99761a9 100644
--- a/src/main/java/de/thm/arsnova/services/StatisticsService.java
+++ b/src/main/java/de/thm/arsnova/services/StatisticsService.java
@@ -15,9 +15,6 @@ public class StatisticsService implements IStatisticsService {
@Autowired
private IDatabaseDao databaseDao;
- @Autowired
- private IUserService userService;
-
@Autowired
private SessionRegistry sessionRegistry;