diff --git a/src/main/java/de/thm/arsnova/LoginAuthenticationFailureHandler.java b/src/main/java/de/thm/arsnova/LoginAuthenticationFailureHandler.java
index 86329bba041d42b764f9ee322782e7d6aa4856a5..48625a361847a93cb0ebd6236cbc3732a8982418 100644
--- a/src/main/java/de/thm/arsnova/LoginAuthenticationFailureHandler.java
+++ b/src/main/java/de/thm/arsnova/LoginAuthenticationFailureHandler.java
@@ -54,8 +54,8 @@ public class LoginAuthenticationFailureHandler extends
redirectStrategy.sendRedirect(request, response, failureUrl);
}
- public final void setDefaultFailureUrl(final String failureUrl) {
- this.failureUrl = failureUrl;
+ public final void setDefaultFailureUrl(final String url) {
+ failureUrl = url;
}
}
diff --git a/src/main/java/de/thm/arsnova/LoginAuthenticationSucessHandler.java b/src/main/java/de/thm/arsnova/LoginAuthenticationSucessHandler.java
index 0226d0f6fa5e12e7a069ebe03ad48a24fb857cf0..81feacfe4b02c91914811f561b089b5a8783945e 100644
--- a/src/main/java/de/thm/arsnova/LoginAuthenticationSucessHandler.java
+++ b/src/main/java/de/thm/arsnova/LoginAuthenticationSucessHandler.java
@@ -43,11 +43,11 @@ public class LoginAuthenticationSucessHandler extends
return targetUrl;
}
String redirect = (String) session.getAttribute("ars-login-success-url");
-
+
return redirect;
}
- public final void setTargetUrl(final String newTargetUrl) {
- this.targetUrl = newTargetUrl;
+ public final void setTargetUrl(final String url) {
+ targetUrl = url;
}
}
diff --git a/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java b/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java
index deb90a82251de9ea226397ecaa5411e035b335d9..6236a4a77a9077da5a808cac7197c7e81aae333d 100644
--- a/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java
@@ -57,7 +57,7 @@ public class AudienceQuestionController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Deprecated-API", "1");
-
+
return questionService.getInterposedCount(sessionkey);
}
@@ -68,7 +68,7 @@ public class AudienceQuestionController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Deprecated-API", "1");
-
+
return questionService.getInterposedReadingCount(sessionkey);
}
diff --git a/src/main/java/de/thm/arsnova/controller/FeedbackController.java b/src/main/java/de/thm/arsnova/controller/FeedbackController.java
index 808368ce1c0be04d7b74497d811fbde3e0e6e6d7..02aeb0e199d39792d0d15e925f11bd0c6c894161 100644
--- a/src/main/java/de/thm/arsnova/controller/FeedbackController.java
+++ b/src/main/java/de/thm/arsnova/controller/FeedbackController.java
@@ -53,7 +53,7 @@ public class FeedbackController extends AbstractController {
@ResponseBody
public final Feedback getFeedback(@PathVariable final String sessionkey, final HttpServletResponse response) {
response.addHeader("X-Deprecated-API", "1");
-
+
return feedbackService.getFeedback(sessionkey);
}
@@ -61,7 +61,7 @@ public class FeedbackController extends AbstractController {
@ResponseBody
public final Integer getMyFeedback(@PathVariable final String sessionkey, final HttpServletResponse response) {
Integer value = feedbackService.getMyFeedback(sessionkey, userService.getCurrentUser());
-
+
response.addHeader("X-Deprecated-API", "1");
if (value != null && value >= Feedback.MIN_FEEDBACK_TYPE && value <= Feedback.MAX_FEEDBACK_TYPE) {
@@ -74,15 +74,18 @@ public class FeedbackController extends AbstractController {
@ResponseBody
public final int getFeedbackCount(@PathVariable final String sessionkey, final HttpServletResponse response) {
response.addHeader("X-Deprecated-API", "1");
-
+
return feedbackService.getFeedbackCount(sessionkey);
}
@RequestMapping(value = "/session/{sessionkey}/roundedaveragefeedback", method = RequestMethod.GET)
@ResponseBody
- public final long getAverageFeedbackRounded(@PathVariable final String sessionkey, final HttpServletResponse response) {
+ public final long getAverageFeedbackRounded(
+ @PathVariable final String sessionkey,
+ final HttpServletResponse response
+ ) {
response.addHeader("X-Deprecated-API", "1");
-
+
return feedbackService.getAverageFeedbackRounded(sessionkey);
}
@@ -90,7 +93,7 @@ public class FeedbackController extends AbstractController {
@ResponseBody
public final double getAverageFeedback(@PathVariable final String sessionkey, final HttpServletResponse response) {
response.addHeader("X-Deprecated-API", "1");
-
+
return feedbackService.getAverageFeedback(sessionkey);
}
@@ -103,7 +106,7 @@ public class FeedbackController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Deprecated-API", "1");
-
+
User user = userService.getCurrentUser();
if (feedbackService.saveFeedback(sessionkey, value, user)) {
Feedback feedback = feedbackService.getFeedback(sessionkey);
diff --git a/src/main/java/de/thm/arsnova/controller/FoodVoteController.java b/src/main/java/de/thm/arsnova/controller/FoodVoteController.java
index f784b03abdde97ce364e520c253c40c20ecf256b..042a5b2dd34b64760d1b55a8618c8199d6fe0d4b 100644
--- a/src/main/java/de/thm/arsnova/controller/FoodVoteController.java
+++ b/src/main/java/de/thm/arsnova/controller/FoodVoteController.java
@@ -54,7 +54,7 @@ public class FoodVoteController extends AbstractController {
String menustring = JSONObject.fromObject(menu).getString("menu");
foodService.vote(menustring);
}
-
+
@RequestMapping(value = "/", method = RequestMethod.GET)
@ResponseBody
public final List<FoodVote> getFoodVote() {
diff --git a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
index 7c18c10c3dc8550dc5c9675e4b1fd365b77d248c..4986fd2d255b0f143167f0a55cb65d6df548d6c5 100644
--- a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
@@ -140,7 +140,7 @@ public class LecturerQuestionController extends AbstractController {
List<Question> questions = questionService.getSkillQuestions(sessionkey);
if (questions == null || questions.isEmpty()) {
response.setStatus(HttpStatus.NO_CONTENT.value());
-
+
return null;
}
return questions;
@@ -150,12 +150,12 @@ public class LecturerQuestionController extends AbstractController {
@ResponseBody
public final int getSkillQuestionCount(@RequestParam final String sessionkey, final HttpServletResponse response) {
response.addHeader("X-Deprecated-API", "1");
-
+
return questionService.getSkillQuestionCount(sessionkey);
}
/*
- * TODO: is this used anywhere?
+ * TODO is this used anywhere?
@RequestMapping(value = "/ids", method = RequestMethod.GET)
@ResponseBody
public final List<String> getQuestionIds(
@@ -189,9 +189,8 @@ public class LecturerQuestionController extends AbstractController {
if (answers == null || answers.isEmpty()) {
throw new NoContentException();
}
-
response.addHeader("X-Deprecated-API", "1");
-
+
return answers;
}
@@ -221,9 +220,9 @@ public class LecturerQuestionController extends AbstractController {
response.setStatus(HttpStatus.NO_CONTENT.value());
return null;
}
-
+
response.addHeader("X-Deprecated-API", "1");
-
+
return answer;
}
@@ -317,7 +316,7 @@ public class LecturerQuestionController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Deprecated-API", "1");
-
+
return questionService.getAnswerCount(questionId);
}
@@ -337,7 +336,7 @@ public class LecturerQuestionController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Deprecated-API", "1");
-
+
return questionService.getMytAnswers(sessionkey);
}
@@ -348,7 +347,7 @@ public class LecturerQuestionController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Deprecated-API", "1");
-
+
return questionService.getTotalAnswerCount(sessionkey);
}
diff --git a/src/main/java/de/thm/arsnova/controller/LegacyController.java b/src/main/java/de/thm/arsnova/controller/LegacyController.java
index fb9556aa8ede94491f32c241ad39b925952d3335..8f2c5b7a0774467e35830a32f96d2f870e9faeee 100644
--- a/src/main/java/de/thm/arsnova/controller/LegacyController.java
+++ b/src/main/java/de/thm/arsnova/controller/LegacyController.java
@@ -39,7 +39,7 @@ public class LegacyController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Deprecated-API", "1");
-
+
return "forward:/session/?ownedonly=true";
}
@@ -48,7 +48,7 @@ public class LegacyController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Deprecated-API", "1");
-
+
return "forward:/session/?visitedonly=true";
}
diff --git a/src/main/java/de/thm/arsnova/controller/LoginController.java b/src/main/java/de/thm/arsnova/controller/LoginController.java
index 798fa0f91a5c84e2409d7d7eebb17f553d353281..df989d2733c276e8554a04b64b2007ee382caffd 100644
--- a/src/main/java/de/thm/arsnova/controller/LoginController.java
+++ b/src/main/java/de/thm/arsnova/controller/LoginController.java
@@ -95,14 +95,14 @@ public class LoginController extends AbstractController {
if (null == referer) {
referer = "/";
}
-
- request.getSession().setAttribute("ars-login-success-url",
+
+ request.getSession().setAttribute("ars-login-success-url",
null == successUrl ? referer + "#auth/checkLogin" : successUrl
);
- request.getSession().setAttribute("ars-login-failure-url",
+ request.getSession().setAttribute("ars-login-failure-url",
null == failureUrl ? referer : failureUrl
);
-
+
if ("cas".equals(type)) {
casEntryPoint.commence(request, response, null);
} else if ("twitter".equals(type)) {
@@ -123,7 +123,7 @@ public class LoginController extends AbstractController {
} else {
username = "Guest" + Sha512DigestUtils.shaHex(request.getSession().getId()).substring(0, 10);
}
- org.springframework.security.core.userdetails.User user =
+ org.springframework.security.core.userdetails.User user =
new org.springframework.security.core.userdetails.User(
username, "", true, true, true, true, authorities
);
diff --git a/src/main/java/de/thm/arsnova/controller/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java
index 50639f5fc26dd7f0859a1eea2b1acbaffd33a383..4e437984e87e065f30a90508372589609abada0c 100644
--- a/src/main/java/de/thm/arsnova/controller/SessionController.java
+++ b/src/main/java/de/thm/arsnova/controller/SessionController.java
@@ -72,7 +72,7 @@ public class SessionController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Deprecated-API", "1");
-
+
User user = userService.getCurrentUser();
LoggedIn loggedIn = sessionService.registerAsOnlineUser(user, sessionkey);
if (loggedIn != null) {
@@ -89,7 +89,7 @@ public class SessionController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Deprecated-API", "1");
-
+
return sessionService.countActiveUsers(sessionkey);
}
@@ -129,14 +129,14 @@ public class SessionController extends AbstractController {
) {
User user = userService.getCurrentUser();
List<Session> sessions = null;
-
- /* TODO: Could @Authorized annotation be used instead of this check? */
+
+ /* TODO Could @Authorized annotation be used instead of this check? */
if (null == user) {
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
return null;
}
-
- /* TODO: implement all parameter combinations, implement use of user parameter */
+
+ /* TODO implement all parameter combinations, implement use of user parameter */
if (ownedOnly && !visitedOnly) {
sessions = sessionService.getMySessions(user);
} else if (visitedOnly && !ownedOnly) {
@@ -145,21 +145,21 @@ public class SessionController extends AbstractController {
response.setStatus(HttpStatus.NOT_IMPLEMENTED.value());
return null;
}
-
+
if (sessions == null || sessions.isEmpty()) {
response.setStatus(HttpServletResponse.SC_NO_CONTENT);
return null;
}
-
+
if (sortby != null && sortby.equals("shortname")) {
Collections.sort(sessions, new SessionShortNameComperator());
} else {
Collections.sort(sessions, new SessionNameComperator());
}
-
+
return sessions;
}
-
+
/* internal redirections */
@RequestMapping(value = "/{sessionKey}/lecturerquestion")
@@ -168,7 +168,7 @@ public class SessionController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Forwarded", "1");
-
+
return String.format("forward:/lecturerquestion/?sessionkey=%s", sessionKey);
}
@@ -179,7 +179,7 @@ public class SessionController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Forwarded", "1");
-
+
return String.format("forward:/lecturerquestion/%s/?sessionkey=%s", arg1, sessionKey);
}
@@ -191,7 +191,7 @@ public class SessionController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Forwarded", "1");
-
+
return String.format("forward:/lecturerquestion/%s/%s/?sessionkey=%s", arg1, arg2, sessionKey);
}
@@ -204,7 +204,7 @@ public class SessionController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Forwarded", "1");
-
+
return String.format("forward:/lecturerquestion/%s/%s/%s/?sessionkey=%s", arg1, arg2, arg3, sessionKey);
}
@@ -214,7 +214,7 @@ public class SessionController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Forwarded", "1");
-
+
return String.format("forward:/audiencequestion/?sessionkey=%s", sessionKey);
}
@@ -225,7 +225,7 @@ public class SessionController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Forwarded", "1");
-
+
return String.format("forward:/audiencequestion/%s/?sessionkey=%s", arg1, sessionKey);
}
@@ -237,7 +237,7 @@ public class SessionController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Forwarded", "1");
-
+
return String.format("forward:/audiencequestion/%s/%s/?sessionkey=%s", arg1, arg2, sessionKey);
}
@@ -250,7 +250,7 @@ public class SessionController extends AbstractController {
final HttpServletResponse response
) {
response.addHeader("X-Forwarded", "1");
-
+
return String.format("forward:/audiencequestion/%s/%s/%s/?sessionkey=%s", arg1, arg2, arg3, sessionKey);
}
}
diff --git a/src/main/java/de/thm/arsnova/controller/SocketController.java b/src/main/java/de/thm/arsnova/controller/SocketController.java
index b9ad8aeb64454dcc3edd34f7673f22a50ef3bce5..c3bb58835179af3ae4c6c1e82921ba82128da184 100644
--- a/src/main/java/de/thm/arsnova/controller/SocketController.java
+++ b/src/main/java/de/thm/arsnova/controller/SocketController.java
@@ -59,9 +59,9 @@ public class SocketController extends AbstractController {
User u = userService.getCurrentUser();
LOGGER.info("authorize session: " + socketid + ", user is: " + u);
response.setStatus(u != null ? HttpStatus.NO_CONTENT.value() : HttpStatus.UNAUTHORIZED.value());
- if(u != null) {
- userService.putUser2SocketId(UUID.fromString(socketid), u);
- }
+ if (u != null) {
+ userService.putUser2SocketId(UUID.fromString(socketid), u);
+ }
}
@RequestMapping(value = "/url", method = RequestMethod.GET)
diff --git a/src/main/java/de/thm/arsnova/controller/StatisticsController.java b/src/main/java/de/thm/arsnova/controller/StatisticsController.java
index 38b99a40fb22be8a2eec7522e9829e3494c7251d..37074be6f1013dd24c8e571a7efc19070a7db039 100644
--- a/src/main/java/de/thm/arsnova/controller/StatisticsController.java
+++ b/src/main/java/de/thm/arsnova/controller/StatisticsController.java
@@ -27,7 +27,7 @@ public class StatisticsController {
@ResponseBody
public final String countActiveUsers(HttpServletResponse response) {
response.addHeader("X-Deprecated-API", "1");
-
+
return Integer.toString(statisticsService.countActiveUsers());
}
@@ -35,7 +35,7 @@ public class StatisticsController {
@ResponseBody
public final String countSessions(HttpServletResponse response) {
response.addHeader("X-Deprecated-API", "1");
-
+
return Integer.toString(statisticsService.getStatistics().getOpenSessions()
+ statisticsService.getStatistics().getClosedSessions());
}