From 28f67f40f1a8c69f1e076049c17989faf1f3ca32 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Wed, 21 Aug 2019 19:27:28 +0200
Subject: [PATCH] Remove redundant modifiers and add Checkstyle rule
---
checkstyle.xml | 1 +
.../de/thm/arsnova/persistence/AnswerRepository.java | 2 +-
.../de/thm/arsnova/persistence/ContentRepository.java | 2 +-
.../de/thm/arsnova/persistence/CrudRepository.java | 2 +-
.../arsnova/service/FeedbackStorageServiceImpl.java | 2 +-
src/main/java/de/thm/arsnova/service/MotdService.java | 10 +++++-----
src/main/java/de/thm/arsnova/service/RoomService.java | 2 +-
src/main/java/de/thm/arsnova/service/TimerService.java | 10 +++++-----
.../java/de/thm/arsnova/service/UserServiceImpl.java | 2 +-
.../arsnova/service/score/VariantScoreCalculator.java | 2 +-
src/main/java/de/thm/arsnova/util/ImageUtils.java | 8 ++++----
11 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/checkstyle.xml b/checkstyle.xml
index ce622a22a..f51d92949 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -278,6 +278,7 @@
<property name="tokens" value="VARIABLE_DEF,PARAMETER_DEF"/>
<property name="validateEnhancedForLoopVariable" value="true"/>
</module>
+ <module name="RedundantModifier"/>
<module name="RedundantImport"/>
<module name="UnusedImports"/>
</module>
diff --git a/src/main/java/de/thm/arsnova/persistence/AnswerRepository.java b/src/main/java/de/thm/arsnova/persistence/AnswerRepository.java
index eebde69a8..a733b5360 100644
--- a/src/main/java/de/thm/arsnova/persistence/AnswerRepository.java
+++ b/src/main/java/de/thm/arsnova/persistence/AnswerRepository.java
@@ -27,7 +27,7 @@ import de.thm.arsnova.model.AnswerStatistics;
public interface AnswerRepository extends CrudRepository<Answer, String> {
<T extends Answer> T findByContentIdUserIdPiRound(String contentId, Class<T> type, String userId, int piRound);
- AnswerStatistics findByContentIdRound(String contentId, int round, final int optionCount);
+ AnswerStatistics findByContentIdRound(String contentId, int round, int optionCount);
int countByContentIdRound(String contentId, int round);
diff --git a/src/main/java/de/thm/arsnova/persistence/ContentRepository.java b/src/main/java/de/thm/arsnova/persistence/ContentRepository.java
index 320d031f0..918cc1671 100644
--- a/src/main/java/de/thm/arsnova/persistence/ContentRepository.java
+++ b/src/main/java/de/thm/arsnova/persistence/ContentRepository.java
@@ -18,7 +18,7 @@ public interface ContentRepository extends CrudRepository<Content, String> {
Iterable<Content> findStubsByIds(Set<String> ids);
- Iterable<Content> findStubsByRoomId(final String roomId);
+ Iterable<Content> findStubsByRoomId(String roomId);
List<String> findUnansweredIdsByRoomIdAndUser(String roomId, String userId);
diff --git a/src/main/java/de/thm/arsnova/persistence/CrudRepository.java b/src/main/java/de/thm/arsnova/persistence/CrudRepository.java
index 0035af09c..6222e035e 100644
--- a/src/main/java/de/thm/arsnova/persistence/CrudRepository.java
+++ b/src/main/java/de/thm/arsnova/persistence/CrudRepository.java
@@ -35,5 +35,5 @@ public interface CrudRepository<T, I> extends org.springframework.data.repositor
* @deprecated Use {@link #findById(Object)} instead.
*/
@Deprecated
- T findOne(final I id);
+ T findOne(I id);
}
diff --git a/src/main/java/de/thm/arsnova/service/FeedbackStorageServiceImpl.java b/src/main/java/de/thm/arsnova/service/FeedbackStorageServiceImpl.java
index 4600cf979..8557301f1 100644
--- a/src/main/java/de/thm/arsnova/service/FeedbackStorageServiceImpl.java
+++ b/src/main/java/de/thm/arsnova/service/FeedbackStorageServiceImpl.java
@@ -44,7 +44,7 @@ public class FeedbackStorageServiceImpl implements FeedbackStorageService {
private final Date timestamp;
private final String userId;
- public FeedbackStorageObject(final int initValue, final String userId) {
+ FeedbackStorageObject(final int initValue, final String userId) {
value = initValue;
timestamp = new Date();
this.userId = userId;
diff --git a/src/main/java/de/thm/arsnova/service/MotdService.java b/src/main/java/de/thm/arsnova/service/MotdService.java
index ca328ef7e..69985d8ec 100644
--- a/src/main/java/de/thm/arsnova/service/MotdService.java
+++ b/src/main/java/de/thm/arsnova/service/MotdService.java
@@ -29,11 +29,11 @@ import de.thm.arsnova.model.Motd;
public interface MotdService extends EntityService<Motd> {
List<Motd> getAdminMotds(); //all w/o the sessionmotds
- List<Motd> getAllRoomMotds(final String roomId);
+ List<Motd> getAllRoomMotds(String roomId);
- List<Motd> getCurrentMotds(final Date clientdate, final String audience);
+ List<Motd> getCurrentMotds(Date clientdate, String audience);
- List<Motd> getCurrentRoomMotds(final Date clientdate, final String roomId);
+ List<Motd> getCurrentRoomMotds(Date clientdate, String roomId);
List<Motd> filterMotdsByDate(List<Motd> list, Date clientdate);
@@ -41,9 +41,9 @@ public interface MotdService extends EntityService<Motd> {
Motd save(Motd motd);
- Motd save(final String roomId, final Motd motd);
+ Motd save(String roomId, Motd motd);
Motd update(Motd motd);
- Motd update(final String roomId, Motd motd);
+ Motd update(String roomId, Motd motd);
}
diff --git a/src/main/java/de/thm/arsnova/service/RoomService.java b/src/main/java/de/thm/arsnova/service/RoomService.java
index f8a225a26..4a808372e 100644
--- a/src/main/java/de/thm/arsnova/service/RoomService.java
+++ b/src/main/java/de/thm/arsnova/service/RoomService.java
@@ -35,7 +35,7 @@ public interface RoomService extends EntityService<Room> {
Room getByShortId(String shortId);
- Room getForAdmin(final String id);
+ Room getForAdmin(String id);
Room getInternal(String id, String userId);
diff --git a/src/main/java/de/thm/arsnova/service/TimerService.java b/src/main/java/de/thm/arsnova/service/TimerService.java
index 7fe7f87f9..bfdbe4762 100644
--- a/src/main/java/de/thm/arsnova/service/TimerService.java
+++ b/src/main/java/de/thm/arsnova/service/TimerService.java
@@ -19,13 +19,13 @@
package de.thm.arsnova.service;
public interface TimerService {
- void startNewRound(final String contentId);
+ void startNewRound(String contentId);
- void startNewRoundDelayed(final String contentId, final int time);
+ void startNewRoundDelayed(String contentId, int time);
- void cancelRoundChange(final String contentId);
+ void cancelRoundChange(String contentId);
- void cancelDelayedRoundChange(final String contentId);
+ void cancelDelayedRoundChange(String contentId);
- void resetRoundState(final String contentId);
+ void resetRoundState(String contentId);
}
diff --git a/src/main/java/de/thm/arsnova/service/UserServiceImpl.java b/src/main/java/de/thm/arsnova/service/UserServiceImpl.java
index 00342fd3b..21110d04c 100644
--- a/src/main/java/de/thm/arsnova/service/UserServiceImpl.java
+++ b/src/main/java/de/thm/arsnova/service/UserServiceImpl.java
@@ -571,7 +571,7 @@ public class UserServiceImpl extends DefaultEntityServiceImpl<UserProfile> imple
if ((account.getPasswordResetTime() != null)
&& (System.currentTimeMillis()
< account.getPasswordResetTime().getTime() + REPEATED_PASSWORD_RESET_DELAY_MS)) {
-
+
logger.info("Password reset failed. The reset delay for User {} is still active.", username);
throw new BadRequestException();
diff --git a/src/main/java/de/thm/arsnova/service/score/VariantScoreCalculator.java b/src/main/java/de/thm/arsnova/service/score/VariantScoreCalculator.java
index 549a7d6e0..1fc6802d5 100644
--- a/src/main/java/de/thm/arsnova/service/score/VariantScoreCalculator.java
+++ b/src/main/java/de/thm/arsnova/service/score/VariantScoreCalculator.java
@@ -35,7 +35,7 @@ abstract class VariantScoreCalculator implements ScoreCalculator {
private final SessionStatisticsRepository sessionStatisticsRepository;
- public VariantScoreCalculator(final SessionStatisticsRepository sessionStatisticsRepository) {
+ VariantScoreCalculator(final SessionStatisticsRepository sessionStatisticsRepository) {
this.sessionStatisticsRepository = sessionStatisticsRepository;
}
diff --git a/src/main/java/de/thm/arsnova/util/ImageUtils.java b/src/main/java/de/thm/arsnova/util/ImageUtils.java
index b30d92cac..0d02f2c49 100644
--- a/src/main/java/de/thm/arsnova/util/ImageUtils.java
+++ b/src/main/java/de/thm/arsnova/util/ImageUtils.java
@@ -167,8 +167,8 @@ public class ImageUtils {
final String base64String = imgInfo[1];
final byte[] imageData = Base64.decodeBase64(base64String);
- try (final ByteArrayInputStream bais = new ByteArrayInputStream(imageData);
- final ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+ try (ByteArrayInputStream bais = new ByteArrayInputStream(imageData);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
final BufferedImage originalImage = ImageIO.read(bais);
final BufferedImage newImage = new BufferedImage(width, height, originalImage.getType());
final Graphics2D g = newImage.createGraphics();
@@ -234,8 +234,8 @@ public class ImageUtils {
* @return The <code>byte[]</code> of the image on success, otherwise <code>null</code>.
*/
byte[] convertFileToByteArray(final String imageUrl) {
- try (final InputStream is = new URL(imageUrl).openStream();
- final ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+ try (InputStream is = new URL(imageUrl).openStream();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
final byte[] byteChunk = new byte[CHUNK_SIZE];
int n;
--
GitLab