From 94ef4a8931b9378baa5c7a21ba2e8a1380d25d07 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Wed, 5 Jun 2013 17:59:44 +0200
Subject: [PATCH] Some code cleanups
---
.../arsnova/controller/CourseController.java | 6 +----
.../arsnova/controller/LoginController.java | 3 ++-
.../java/de/thm/arsnova/dao/IDatabaseDao.java | 1 -
.../thm/arsnova/services/FeedbackService.java | 22 +++++++++----------
.../de/thm/arsnova/services/FoodService.java | 6 ++---
.../de/thm/arsnova/services/IUserService.java | 1 -
.../thm/arsnova/services/QuestionService.java | 1 -
.../arsnova/services/StatisticsService.java | 3 ---
8 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/CourseController.java b/src/main/java/de/thm/arsnova/controller/CourseController.java
index 94e06932..5192ecdf 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 df53d1db..cbe8cc95 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 72afe35a..4d9e600e 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 d022b219..f44a4d24 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 46fcabe7..e43906b4 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 8146edd1..9016b6e5 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 b1efb373..78b848cb 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 1509e9e4..86d155ca 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;
--
GitLab