From 3b529471ddfe86037baa5417ba4071117c18d169 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Sun, 24 Aug 2014 12:26:56 +0200
Subject: [PATCH] Automated cleanup
* Organize imports
* Add missing Override annotations
* Remove trailing whitespace
---
.../thm/arsnova/CASLogoutSuccessHandler.java | 2 +-
.../LoginAuthenticationFailureHandler.java | 3 ++-
.../controller/ConfigurationController.java | 2 +-
.../arsnova/controller/LoginController.java | 12 ++++------
.../arsnova/controller/SocketController.java | 2 +-
.../java/de/thm/arsnova/dao/CouchDBDao.java | 1 +
.../de/thm/arsnova/entities/Feedback.java | 2 +-
.../arsnova/entities/InterposedQuestion.java | 2 +-
.../de/thm/arsnova/entities/LoggedIn.java | 2 +-
.../de/thm/arsnova/entities/Question.java | 24 +++++++++----------
.../thm/arsnova/services/ISessionService.java | 1 -
.../de/thm/arsnova/services/IUserService.java | 2 +-
.../de/thm/arsnova/services/UserService.java | 6 +++--
.../arsnova/socket/ARSnovaSocketIOServer.java | 2 --
.../arsnova/config/TestSecurityConfig.java | 1 +
.../de/thm/arsnova/entities/FeedbackTest.java | 21 ++++++++--------
.../services/StatisticsServiceTest.java | 1 -
.../thm/arsnova/services/StubUserService.java | 6 ++---
18 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/CASLogoutSuccessHandler.java b/src/main/java/de/thm/arsnova/CASLogoutSuccessHandler.java
index 013ddc1d8..c30b20007 100644
--- a/src/main/java/de/thm/arsnova/CASLogoutSuccessHandler.java
+++ b/src/main/java/de/thm/arsnova/CASLogoutSuccessHandler.java
@@ -20,7 +20,7 @@ public class CASLogoutSuccessHandler implements LogoutSuccessHandler {
private String casUrl;
private String defaultTarget;
- private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
+ private final RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
@Override
public final void onLogoutSuccess(
diff --git a/src/main/java/de/thm/arsnova/LoginAuthenticationFailureHandler.java b/src/main/java/de/thm/arsnova/LoginAuthenticationFailureHandler.java
index 48625a361..9a775ea2c 100644
--- a/src/main/java/de/thm/arsnova/LoginAuthenticationFailureHandler.java
+++ b/src/main/java/de/thm/arsnova/LoginAuthenticationFailureHandler.java
@@ -35,7 +35,7 @@ import org.springframework.security.web.authentication.SimpleUrlAuthenticationFa
public class LoginAuthenticationFailureHandler extends
SimpleUrlAuthenticationFailureHandler {
- private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
+ private final RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
private String failureUrl;
public static final Logger LOGGER = LoggerFactory.getLogger(LoginAuthenticationFailureHandler.class);
@@ -54,6 +54,7 @@ public class LoginAuthenticationFailureHandler extends
redirectStrategy.sendRedirect(request, response, failureUrl);
}
+ @Override
public final void setDefaultFailureUrl(final String url) {
failureUrl = url;
}
diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 9d4d96c73..60d14ad4a 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
/**
- * The ConfigurationController provides frontend clients with information necessary to correctly interact with the
+ * The ConfigurationController provides frontend clients with information necessary to correctly interact with the
* backend and other frontends as well as settings for ARSnova. The the alternative /arsnova-config route is necessary
* in case the backend application is deployed as root context.
*/
diff --git a/src/main/java/de/thm/arsnova/controller/LoginController.java b/src/main/java/de/thm/arsnova/controller/LoginController.java
index 4236fdfed..5bc1ae09e 100644
--- a/src/main/java/de/thm/arsnova/controller/LoginController.java
+++ b/src/main/java/de/thm/arsnova/controller/LoginController.java
@@ -19,8 +19,6 @@
package de.thm.arsnova.controller;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
@@ -188,7 +186,7 @@ public class LoginController extends AbstractController {
SecurityContextHolder.getContext().setAuthentication(auth);
request.getSession(true).setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY,
SecurityContextHolder.getContext());
-
+
return;
}
} catch (AuthenticationException e) {
@@ -252,7 +250,7 @@ public class LoginController extends AbstractController {
) throws IOException, ServletException {
View result = null;
- /* Use URLs from a request parameters for redirection as long as the
+ /* Use URLs from a request parameters for redirection as long as the
* URL is not absolute (to prevent abuse of the redirection). */
if (UrlUtils.isAbsoluteUrl(successUrl)) {
successUrl = "/";
@@ -261,7 +259,7 @@ public class LoginController extends AbstractController {
failureUrl = "/";
}
- /* Workaround until a solution is found to do a redirect which is
+ /* Workaround until a solution is found to do a redirect which is
* relative to the server root instead of the context path */
String port;
if ("https".equals(request.getScheme())) {
@@ -295,7 +293,7 @@ public class LoginController extends AbstractController {
@RequestMapping(value = { "/auth/", "/whoami" }, method = RequestMethod.GET)
@ResponseBody
public final User whoami() {
- userSessionService.setUser(userService.getCurrentUser());
+ userSessionService.setUser(userService.getCurrentUser());
return userService.getCurrentUser();
}
@@ -310,7 +308,7 @@ public class LoginController extends AbstractController {
}
return new RedirectView(request.getHeader("referer") != null ? request.getHeader("referer") : "/");
}
-
+
@RequestMapping(value = { "/auth/services" }, method = RequestMethod.GET)
@ResponseBody
public final List<ServiceDescription> getServices(final HttpServletRequest request) {
diff --git a/src/main/java/de/thm/arsnova/controller/SocketController.java b/src/main/java/de/thm/arsnova/controller/SocketController.java
index 0b8460814..dd874dd03 100644
--- a/src/main/java/de/thm/arsnova/controller/SocketController.java
+++ b/src/main/java/de/thm/arsnova/controller/SocketController.java
@@ -50,7 +50,7 @@ public class SocketController extends AbstractController {
@Autowired
private ARSnovaSocketIOServer server;
-
+
private static final Logger logger = LoggerFactory.getLogger(SocketController.class);
@RequestMapping(method = RequestMethod.POST, value = "/assign")
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 3c80c5832..a6f7b3128 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -1389,6 +1389,7 @@ public class CouchDBDao implements IDatabaseDao {
return new AbstractMap.SimpleEntry<Integer, Integer>((int)Math.round(myProgress*100), courseProgress);
}
+ @Override
public DbUser createOrUpdateUser(DbUser user) {
try {
String id = user.getId();
diff --git a/src/main/java/de/thm/arsnova/entities/Feedback.java b/src/main/java/de/thm/arsnova/entities/Feedback.java
index d75595be4..b2b4e995a 100644
--- a/src/main/java/de/thm/arsnova/entities/Feedback.java
+++ b/src/main/java/de/thm/arsnova/entities/Feedback.java
@@ -30,7 +30,7 @@ public class Feedback {
public static final int FEEDBACK_SLOWER = 2;
public static final int FEEDBACK_AWAY = 3;
- private List<Integer> values;
+ private final List<Integer> values;
public Feedback(final int a, final int b, final int c, final int d) {
values = new ArrayList<Integer>();
diff --git a/src/main/java/de/thm/arsnova/entities/InterposedQuestion.java b/src/main/java/de/thm/arsnova/entities/InterposedQuestion.java
index 469733dba..204bb9d39 100644
--- a/src/main/java/de/thm/arsnova/entities/InterposedQuestion.java
+++ b/src/main/java/de/thm/arsnova/entities/InterposedQuestion.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2012 THM webMedia
- *
+ *
* This file is part of ARSnova.
*
* ARSnova is free software: you can redistribute it and/or modify
diff --git a/src/main/java/de/thm/arsnova/entities/LoggedIn.java b/src/main/java/de/thm/arsnova/entities/LoggedIn.java
index 1c4b91719..32f39b5eb 100644
--- a/src/main/java/de/thm/arsnova/entities/LoggedIn.java
+++ b/src/main/java/de/thm/arsnova/entities/LoggedIn.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2012 THM webMedia
- *
+ *
* This file is part of ARSnova.
*
* ARSnova is free software: you can redistribute it and/or modify
diff --git a/src/main/java/de/thm/arsnova/entities/Question.java b/src/main/java/de/thm/arsnova/entities/Question.java
index ccff7199c..207724109 100644
--- a/src/main/java/de/thm/arsnova/entities/Question.java
+++ b/src/main/java/de/thm/arsnova/entities/Question.java
@@ -200,7 +200,7 @@ public class Question {
public boolean getCvIsColored() {
return cvIsColored;
}
-
+
public void setCvIsColored(boolean cvIsColored) {
this.cvIsColored = cvIsColored;
}
@@ -276,7 +276,7 @@ public class Question {
public void setZoomLvl(final int zoomLvl) {
this.zoomLvl = zoomLvl;
}
-
+
public int getGridOffsetX() {
return gridOffsetX;
}
@@ -284,7 +284,7 @@ public class Question {
public void setGridOffsetX(int gridOffsetX) {
this.gridOffsetX = gridOffsetX;
}
-
+
public int getGridOffsetY() {
return gridOffsetY;
}
@@ -292,7 +292,7 @@ public class Question {
public void setGridOffsetY(int gridOffsetY) {
this.gridOffsetY = gridOffsetY;
}
-
+
public int getGridZoomLvl() {
return gridZoomLvl;
}
@@ -300,7 +300,7 @@ public class Question {
public void setGridZoomLvl(int gridZoomLvl) {
this.gridZoomLvl = gridZoomLvl;
}
-
+
public int getGridSizeX() {
return gridSizeX;
}
@@ -308,7 +308,7 @@ public class Question {
public void setGridSizeX(int gridSizeX) {
this.gridSizeX = gridSizeX;
}
-
+
public int getGridSizeY() {
return gridSizeY;
}
@@ -316,7 +316,7 @@ public class Question {
public void setGridSizeY(int gridSizeY) {
this.gridSizeY = gridSizeY;
}
-
+
public boolean getGridIsHidden() {
return gridIsHidden;
}
@@ -324,7 +324,7 @@ public class Question {
public void setGridIsHidden(boolean gridIsHidden) {
this.gridIsHidden = gridIsHidden;
}
-
+
public int getImgRotation() {
return imgRotation;
}
@@ -332,7 +332,7 @@ public class Question {
public void setImgRotation(int imgRotation) {
this.imgRotation = imgRotation;
}
-
+
public boolean getToggleFieldsLeft() {
return toggleFieldsLeft;
}
@@ -340,7 +340,7 @@ public class Question {
public void setToggleFieldsLeft(boolean toggleFieldsLeft) {
this.toggleFieldsLeft = toggleFieldsLeft;
}
-
+
public int getNumClickableFields() {
return numClickableFields;
}
@@ -348,11 +348,11 @@ public class Question {
public void setNumClickableFields(int numClickableFields) {
this.numClickableFields = numClickableFields;
}
-
+
public int getThresholdCorrectAnswers() {
return thresholdCorrectAnswers;
}
-
+
public void setThresholdCorrectAnswers(int thresholdCorrectAnswers) {
this.thresholdCorrectAnswers = thresholdCorrectAnswers;
}
diff --git a/src/main/java/de/thm/arsnova/services/ISessionService.java b/src/main/java/de/thm/arsnova/services/ISessionService.java
index 16faadd4a..86f823734 100644
--- a/src/main/java/de/thm/arsnova/services/ISessionService.java
+++ b/src/main/java/de/thm/arsnova/services/ISessionService.java
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.UUID;
import de.thm.arsnova.connector.model.Course;
-import de.thm.arsnova.entities.LoggedIn;
import de.thm.arsnova.entities.Session;
public interface ISessionService {
diff --git a/src/main/java/de/thm/arsnova/services/IUserService.java b/src/main/java/de/thm/arsnova/services/IUserService.java
index 071411e9a..c2fec43dc 100644
--- a/src/main/java/de/thm/arsnova/services/IUserService.java
+++ b/src/main/java/de/thm/arsnova/services/IUserService.java
@@ -28,7 +28,7 @@ import de.thm.arsnova.entities.User;
public interface IUserService {
User getCurrentUser();
-
+
boolean isBannedFromLogin(String addr);
void increaseFailedLoginCount(String addr);
diff --git a/src/main/java/de/thm/arsnova/services/UserService.java b/src/main/java/de/thm/arsnova/services/UserService.java
index 933b49fdf..a6435db43 100644
--- a/src/main/java/de/thm/arsnova/services/UserService.java
+++ b/src/main/java/de/thm/arsnova/services/UserService.java
@@ -63,7 +63,7 @@ public class UserService implements IUserService {
private static final int LOGIN_BAN_RESET_DELAY_MS = 2 * 60 * 1000;
private static final int REPEATED_PASSWORD_RESET_DELAY_MS = 3 * 60 * 1000;
-
+
private static final int PASSWORD_RESET_KEY_DURABILITY_MS = 2 * 60 * 60 * 1000;
public static final Logger LOGGER = LoggerFactory.getLogger(UserService.class);
@@ -195,12 +195,14 @@ public class UserService implements IUserService {
return user;
}
+ @Override
public boolean isBannedFromLogin(String addr) {
return loginBans.contains(addr);
}
+ @Override
public void increaseFailedLoginCount(String addr) {
- Byte tries = (Byte) loginTries.get(addr);
+ Byte tries = loginTries.get(addr);
if (null == tries) {
tries = 0;
}
diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
index 3398c652a..262a3ab9c 100644
--- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
+++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
@@ -1,7 +1,5 @@
package de.thm.arsnova.socket;
-import io.netty.channel.ChannelOption;
-
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
diff --git a/src/test/java/de/thm/arsnova/config/TestSecurityConfig.java b/src/test/java/de/thm/arsnova/config/TestSecurityConfig.java
index 012c40b7b..9aa848ea6 100644
--- a/src/test/java/de/thm/arsnova/config/TestSecurityConfig.java
+++ b/src/test/java/de/thm/arsnova/config/TestSecurityConfig.java
@@ -48,6 +48,7 @@ public class TestSecurityConfig extends SecurityConfig {
return super.authenticationManager();
}
+ @Override
@Bean
public SessionRegistry sessionRegistry() {
return new SessionRegistryImpl();
diff --git a/src/test/java/de/thm/arsnova/entities/FeedbackTest.java b/src/test/java/de/thm/arsnova/entities/FeedbackTest.java
index 239df3d3a..07e9db7c9 100644
--- a/src/test/java/de/thm/arsnova/entities/FeedbackTest.java
+++ b/src/test/java/de/thm/arsnova/entities/FeedbackTest.java
@@ -18,49 +18,50 @@
*/
package de.thm.arsnova.entities;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
public class FeedbackTest {
-
+
@Test
public void differentObjectsShouldNotBeEqual() {
Feedback f = new Feedback(0, 0, 0, 0);
String x = "";
-
+
assertFalse(f.equals(x));
}
-
+
@Test
public void differentlySizedFeedbacksShouldNotBeEqual() {
Feedback f1 = new Feedback(0, 0, 0, 0);
Feedback f2 = new Feedback(0, 0, 0, 0);
f2.getValues().add(0);
-
+
assertFalse(f1.equals(f2));
}
-
+
@Test
public void nullShouldNotBeEqual() {
Feedback f = new Feedback(0, 0, 0, 0);
assertFalse(f.equals(null));
}
-
+
@Test
public void sameContentsShouldBeEqual() {
Feedback f1 = new Feedback(1, 2, 3, 4);
Feedback f2 = new Feedback(1, 2, 3, 4);
-
+
assertTrue(f1.equals(f2));
assertTrue(f2.equals(f1));
}
-
+
@Test
public void differentContentsShouldNotBeEqual() {
Feedback f1 = new Feedback(1, 2, 3, 4);
Feedback f2 = new Feedback(4, 3, 2, 1);
-
+
assertFalse(f1.equals(f2));
assertFalse(f2.equals(f1));
}
diff --git a/src/test/java/de/thm/arsnova/services/StatisticsServiceTest.java b/src/test/java/de/thm/arsnova/services/StatisticsServiceTest.java
index 6b78ad029..802d94294 100644
--- a/src/test/java/de/thm/arsnova/services/StatisticsServiceTest.java
+++ b/src/test/java/de/thm/arsnova/services/StatisticsServiceTest.java
@@ -1,7 +1,6 @@
package de.thm.arsnova.services;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.when;
import org.junit.After;
diff --git a/src/test/java/de/thm/arsnova/services/StubUserService.java b/src/test/java/de/thm/arsnova/services/StubUserService.java
index c7667d2e8..6132a089f 100644
--- a/src/test/java/de/thm/arsnova/services/StubUserService.java
+++ b/src/test/java/de/thm/arsnova/services/StubUserService.java
@@ -25,11 +25,11 @@ import de.thm.arsnova.entities.User;
public class StubUserService extends UserService {
private User stubUser = null;
-
+
public void setUserAuthenticated(boolean isAuthenticated) {
this.setUserAuthenticated(isAuthenticated, "ptsr00");
}
-
+
public void setUserAuthenticated(boolean isAuthenticated, String username) {
if (isAuthenticated) {
stubUser = new User(new UsernamePasswordAuthenticationToken(username, "testpassword"));
@@ -46,7 +46,7 @@ public class StubUserService extends UserService {
public User getCurrentUser() {
return stubUser;
}
-
+
public void setRole(UserSessionService.Role role) {
stubUser.setRole(role);
}
--
GitLab