Skip to content
Snippets Groups Projects
Commit 8f8d81d2 authored by Daniel Gerhardt's avatar Daniel Gerhardt
Browse files

Fixed some checkstyle errors.

parent 0ed21496
No related merge requests found
Showing
with 57 additions and 55 deletions
......@@ -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;
}
}
......@@ -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;
}
}
......@@ -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);
}
......
......@@ -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);
......
......@@ -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() {
......
......@@ -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);
}
......
......@@ -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";
}
......
......@@ -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
);
......
......@@ -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);
}
}
......@@ -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)
......
......@@ -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());
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment