From 387c63477259b8c23c46da831185e93d815f4351 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Tue, 25 Jun 2019 16:26:49 +0200
Subject: [PATCH] Fix multiple code style violations
Rules:
* (naming) ParameterName
* (naming) LocalVariableName
* (naming) MemberName
* (naming) InterfaceTypeParameterName
* (naming) AbbreviationAsWordInName
* (modifier) ModifierOrder
* (blocks) NeedBraces
* (coding) OneStatementPerLine
* (coding) MultipleVariableDeclarations
* (coding) VariableDeclarationUsageDistance
* (coding) MissingSwitchDefault
* (coding) OverloadMethodsDeclarationOrder
* (extension) RightCurlySame
* (misc) ArrayTypeStyle
---
.../java/de/thm/arsnova/config/AppConfig.java | 2 +-
.../thm/arsnova/config/WebSocketConfig.java | 12 +-
.../controller/ConfigurationController.java | 8 +-
.../controller/ControllerExceptionHelper.java | 2 +
.../arsnova/controller/WelcomeController.java | 4 +-
.../controller/v2/SocketController.java | 2 +-
.../de/thm/arsnova/model/MigrationState.java | 2 +-
.../model/migration/FromV2Migrator.java | 3 +
.../arsnova/model/migration/ToV2Migrator.java | 88 ++++----
.../CouchDbTypeFieldConverter.java | 4 +-
.../CouchDbTypeFieldV2Converter.java | 4 +-
.../transport/ImportExportContainer.java | 206 +++++++++---------
.../arsnova/persistence/CrudRepository.java | 4 +-
.../couchdb/CouchDbCommentRepository.java | 3 +-
.../couchdb/CouchDbStatisticsRepository.java | 2 +
.../couchdb/migrations/V2ToV3Migration.java | 24 +-
.../jwt/JwtAuthenticationProvider.java | 4 +-
.../pac4j/OauthAuthenticationProvider.java | 10 +-
.../thm/arsnova/service/MotdServiceImpl.java | 19 +-
.../thm/arsnova/service/RoomServiceImpl.java | 14 +-
.../thm/arsnova/service/UserServiceImpl.java | 9 +-
.../java/de/thm/arsnova/util/ImageUtils.java | 5 +-
.../websocket/ArsnovaSocketioServer.java | 2 +-
.../websocket/ArsnovaSocketioServerImpl.java | 14 +-
.../handler/FeedbackCommandHandler.java | 2 +-
.../arsnova/websocket/message/Content.java | 11 +-
.../websocket/message/FeedbackChanged.java | 8 +-
.../message/FeedbackChangedPayload.java | 8 +-
28 files changed, 255 insertions(+), 221 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/config/AppConfig.java b/src/main/java/de/thm/arsnova/config/AppConfig.java
index 74aaf2e1e..ec8803475 100644
--- a/src/main/java/de/thm/arsnova/config/AppConfig.java
+++ b/src/main/java/de/thm/arsnova/config/AppConfig.java
@@ -270,7 +270,7 @@ public class AppConfig implements WebMvcConfigurer {
final ArsnovaSocketioServerImpl socketioServer = new ArsnovaSocketioServerImpl();
socketioServer.setHostIp(socketAddress);
socketioServer.setPortNumber(socketPort);
- socketioServer.setUseSSL(!socketKeystore.isEmpty());
+ socketioServer.setUseSsl(!socketKeystore.isEmpty());
socketioServer.setKeystore(socketKeystore);
socketioServer.setStorepass(socketKeystorePassword);
return socketioServer;
diff --git a/src/main/java/de/thm/arsnova/config/WebSocketConfig.java b/src/main/java/de/thm/arsnova/config/WebSocketConfig.java
index 10d6a2008..f8dd3dee2 100644
--- a/src/main/java/de/thm/arsnova/config/WebSocketConfig.java
+++ b/src/main/java/de/thm/arsnova/config/WebSocketConfig.java
@@ -14,10 +14,10 @@ import de.thm.arsnova.websocket.handler.AuthChannelInterceptorAdapter;
@Configuration
@EnableWebSocketMessageBroker
public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
- private final String MESSAGING_PREFIX = "/backend";
- private final String[] DESTINATION_PREFIX = {"/exchange", "/topic", "/queue"};
- private final String USER_REGISTRY_BROADCAST = "/topic/log-user-registry";
- private final String USER_DESTINATION_BROADCAST = "/queue/log-unresolved-user";
+ private static final String MESSAGING_PREFIX = "/backend";
+ private static final String[] DESTINATION_PREFIX = {"/exchange", "/topic", "/queue"};
+ private static final String USER_REGISTRY_BROADCAST = "/topic/log-user-registry";
+ private static final String USER_DESTINATION_BROADCAST = "/queue/log-unresolved-user";
@Value("${messaging.relay.enabled}") private Boolean relayEnabled;
@Value("${messaging.relay.host}") private String relayHost;
@@ -33,8 +33,6 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
this.authChannelInterceptorAdapter = authChannelInterceptorAdapter;
}
-
-
@Override
public void configureMessageBroker(MessageBrokerRegistry config) {
config.setApplicationDestinationPrefixes(MESSAGING_PREFIX);
@@ -58,10 +56,8 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
registry.addEndpoint("/ws").setAllowedOrigins(corsOrigins).withSockJS();
}
-
@Override
public void configureClientInboundChannel(ChannelRegistration registration) {
registration.setInterceptors(authChannelInterceptorAdapter);
}
-
}
diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index ee0125347..6a69d8b27 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -163,10 +163,10 @@ public class ConfigurationController extends AbstractController {
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public Map<String, Object> getConfiguration(HttpServletRequest request) {
- Map<String, Object> config = new HashMap<>();
- Map<String, Boolean> features = new HashMap<>();
- Map<String, String> publicPool = new HashMap<>();
- Map<String, Object> splashscreen = new HashMap<>();
+ final Map<String, Object> config = new HashMap<>();
+ final Map<String, Boolean> features = new HashMap<>();
+ final Map<String, String> publicPool = new HashMap<>();
+ final Map<String, Object> splashscreen = new HashMap<>();
/* The API path could be unknown to the client in case the request was forwarded */
if ("".equals(apiPath)) {
diff --git a/src/main/java/de/thm/arsnova/controller/ControllerExceptionHelper.java b/src/main/java/de/thm/arsnova/controller/ControllerExceptionHelper.java
index 6760458a6..55972994e 100644
--- a/src/main/java/de/thm/arsnova/controller/ControllerExceptionHelper.java
+++ b/src/main/java/de/thm/arsnova/controller/ControllerExceptionHelper.java
@@ -63,6 +63,8 @@ public class ControllerExceptionHelper {
case TRACE:
logger.trace(message, e);
break;
+ default:
+ break;
}
}
}
diff --git a/src/main/java/de/thm/arsnova/controller/WelcomeController.java b/src/main/java/de/thm/arsnova/controller/WelcomeController.java
index 1d8e3f584..779d9a2a0 100644
--- a/src/main/java/de/thm/arsnova/controller/WelcomeController.java
+++ b/src/main/java/de/thm/arsnova/controller/WelcomeController.java
@@ -65,8 +65,8 @@ public class WelcomeController extends AbstractController {
@RequestMapping(value = "/", method = RequestMethod.GET, produces = "application/json")
@ResponseBody
public Map<String, Object> jsonHome() {
- Map<String, Object> response = new HashMap<>();
- Map<String, Object> version = new HashMap<>();
+ final Map<String, Object> response = new HashMap<>();
+ final Map<String, Object> version = new HashMap<>();
version.put("string", versionInfoProperties.getProperty("version.string"));
version.put("buildTime", versionInfoProperties.getProperty("version.build-time"));
diff --git a/src/main/java/de/thm/arsnova/controller/v2/SocketController.java b/src/main/java/de/thm/arsnova/controller/v2/SocketController.java
index b957c2aa5..a84d51408 100644
--- a/src/main/java/de/thm/arsnova/controller/v2/SocketController.java
+++ b/src/main/java/de/thm/arsnova/controller/v2/SocketController.java
@@ -89,7 +89,7 @@ public class SocketController extends AbstractController {
nickname = "getSocketUrl")
@RequestMapping(value = "/url", method = RequestMethod.GET, produces = MediaType.TEXT_PLAIN_VALUE)
public String getSocketUrl(final HttpServletRequest request) {
- return (server.isUseSSL() ? "https://" : "http://") + request.getServerName() + ":" + server.getPortNumber();
+ return (server.isUseSsl() ? "https://" : "http://") + request.getServerName() + ":" + server.getPortNumber();
}
}
diff --git a/src/main/java/de/thm/arsnova/model/MigrationState.java b/src/main/java/de/thm/arsnova/model/MigrationState.java
index 48876efe0..5a96ead20 100644
--- a/src/main/java/de/thm/arsnova/model/MigrationState.java
+++ b/src/main/java/de/thm/arsnova/model/MigrationState.java
@@ -75,7 +75,7 @@ public class MigrationState extends Entity {
public void setId(final String id) {
if (!id.equals(this.ID)) {
throw new IllegalArgumentException("ID of this entity must not be changed.");
- };
+ }
}
@Override
diff --git a/src/main/java/de/thm/arsnova/model/migration/FromV2Migrator.java b/src/main/java/de/thm/arsnova/model/migration/FromV2Migrator.java
index 64b357100..30f7f1936 100644
--- a/src/main/java/de/thm/arsnova/model/migration/FromV2Migrator.java
+++ b/src/main/java/de/thm/arsnova/model/migration/FromV2Migrator.java
@@ -347,6 +347,9 @@ public class FromV2Migrator {
case "session":
to.setAudience(de.thm.arsnova.model.Motd.Audience.ROOM);
break;
+ default:
+ /* TODO: Add log message. */
+ break;
}
to.setTitle(from.getTitle());
to.setBody(from.getText());
diff --git a/src/main/java/de/thm/arsnova/model/migration/ToV2Migrator.java b/src/main/java/de/thm/arsnova/model/migration/ToV2Migrator.java
index b5e587534..cef7acfa8 100644
--- a/src/main/java/de/thm/arsnova/model/migration/ToV2Migrator.java
+++ b/src/main/java/de/thm/arsnova/model/migration/ToV2Migrator.java
@@ -62,27 +62,6 @@ public class ToV2Migrator {
to.setRevision(from.getRevision());
}
- public LoggedIn migrateLoggedIn(final UserProfile from) {
- final LoggedIn to = new LoggedIn();
- copyCommonProperties(from, to);
- to.setUser(from.getLoginId());
- to.setTimestamp(from.getLastLoginTimestamp().getTime());
- to.setVisitedSessions(from.getRoomHistory().stream()
- .map(entry -> new VisitedRoom())
- .collect(Collectors.toList()));
-
- return to;
- }
-
- public MotdList migrateMotdList(final UserProfile from) {
- final MotdList to = new MotdList();
- copyCommonProperties(from, to);
- to.setUsername(from.getLoginId());
- to.setMotdkeys(String.join(",", from.getAcknowledgedMotds()));
-
- return to;
- }
-
public Room migrate(final de.thm.arsnova.model.Room from, final Optional<UserProfile> owner) {
final Room to = new Room();
copyCommonProperties(from, to);
@@ -177,18 +156,6 @@ public class ToV2Migrator {
return feature;
}
- public RoomInfo migrateStats(final de.thm.arsnova.model.Room from) {
- RoomInfo to = new RoomInfo(migrate(from));
- RoomStatistics stats = from.getStatistics();
- to.setNumQuestions(stats.getContentCount());
- to.setNumUnanswered(stats.getUnansweredContentCount());
- to.setNumAnswers(stats.getAnswerCount());
- to.setNumInterposed(stats.getCommentCount());
- to.setNumUnredInterposed(stats.getUnreadCommentCount());
-
- return to;
- }
-
public Content migrate(final de.thm.arsnova.model.Content from) {
final Content to = new Content();
copyCommonProperties(from, to);
@@ -281,16 +248,6 @@ public class ToV2Migrator {
return to;
}
- public String migrateChoice(final List<Integer> selectedChoiceIndexes,
- final List<ChoiceQuestionContent.AnswerOption> options) {
- List<String> answers = new ArrayList<>();
- for (int i = 0; i < options.size(); i++) {
- answers.add(selectedChoiceIndexes.contains(i) ? "1" : "0");
- }
-
- return answers.stream().collect(Collectors.joining(","));
- }
-
public Answer migrate(final de.thm.arsnova.model.ChoiceAnswer from,
final de.thm.arsnova.model.ChoiceQuestionContent content) {
return migrate(from, content, Optional.empty());
@@ -356,6 +313,8 @@ public class ToV2Migrator {
case ROOM:
to.setAudience("session");
break;
+ default:
+ break;
}
to.setTitle(from.getTitle());
to.setText(from.getBody());
@@ -412,4 +371,47 @@ public class ToV2Migrator {
return to;
}
+
+ public LoggedIn migrateLoggedIn(final UserProfile from) {
+ final LoggedIn to = new LoggedIn();
+ copyCommonProperties(from, to);
+ to.setUser(from.getLoginId());
+ to.setTimestamp(from.getLastLoginTimestamp().getTime());
+ to.setVisitedSessions(from.getRoomHistory().stream()
+ .map(entry -> new VisitedRoom())
+ .collect(Collectors.toList()));
+
+ return to;
+ }
+
+ public MotdList migrateMotdList(final UserProfile from) {
+ final MotdList to = new MotdList();
+ copyCommonProperties(from, to);
+ to.setUsername(from.getLoginId());
+ to.setMotdkeys(String.join(",", from.getAcknowledgedMotds()));
+
+ return to;
+ }
+
+ public RoomInfo migrateStats(final de.thm.arsnova.model.Room from) {
+ RoomInfo to = new RoomInfo(migrate(from));
+ RoomStatistics stats = from.getStatistics();
+ to.setNumQuestions(stats.getContentCount());
+ to.setNumUnanswered(stats.getUnansweredContentCount());
+ to.setNumAnswers(stats.getAnswerCount());
+ to.setNumInterposed(stats.getCommentCount());
+ to.setNumUnredInterposed(stats.getUnreadCommentCount());
+
+ return to;
+ }
+
+ public String migrateChoice(final List<Integer> selectedChoiceIndexes,
+ final List<ChoiceQuestionContent.AnswerOption> options) {
+ List<String> answers = new ArrayList<>();
+ for (int i = 0; i < options.size(); i++) {
+ answers.add(selectedChoiceIndexes.contains(i) ? "1" : "0");
+ }
+
+ return answers.stream().collect(Collectors.joining(","));
+ }
}
diff --git a/src/main/java/de/thm/arsnova/model/serialization/CouchDbTypeFieldConverter.java b/src/main/java/de/thm/arsnova/model/serialization/CouchDbTypeFieldConverter.java
index 8f1b3293f..498d88ecb 100644
--- a/src/main/java/de/thm/arsnova/model/serialization/CouchDbTypeFieldConverter.java
+++ b/src/main/java/de/thm/arsnova/model/serialization/CouchDbTypeFieldConverter.java
@@ -27,8 +27,8 @@ import de.thm.arsnova.model.Entity;
public class CouchDbTypeFieldConverter implements Converter<Class<? extends Entity>, String> {
@Override
- public String convert(Class<? extends Entity> aClass) {
- return aClass.getSimpleName();
+ public String convert(Class<? extends Entity> clazz) {
+ return clazz.getSimpleName();
}
@Override
diff --git a/src/main/java/de/thm/arsnova/model/serialization/CouchDbTypeFieldV2Converter.java b/src/main/java/de/thm/arsnova/model/serialization/CouchDbTypeFieldV2Converter.java
index 1744a8727..00fa737fa 100644
--- a/src/main/java/de/thm/arsnova/model/serialization/CouchDbTypeFieldV2Converter.java
+++ b/src/main/java/de/thm/arsnova/model/serialization/CouchDbTypeFieldV2Converter.java
@@ -49,8 +49,8 @@ public class CouchDbTypeFieldV2Converter implements Converter<Class<? extends En
}
@Override
- public String convert(Class<? extends Entity> aClass) {
- return typeMapping.get(aClass);
+ public String convert(Class<? extends Entity> clazz) {
+ return typeMapping.get(clazz);
}
@Override
diff --git a/src/main/java/de/thm/arsnova/model/transport/ImportExportContainer.java b/src/main/java/de/thm/arsnova/model/transport/ImportExportContainer.java
index eb4bf7530..1e4f33659 100644
--- a/src/main/java/de/thm/arsnova/model/transport/ImportExportContainer.java
+++ b/src/main/java/de/thm/arsnova/model/transport/ImportExportContainer.java
@@ -93,8 +93,8 @@ public class ImportExportContainer {
return motds;
}
- public void setMotds(List<Motd> mL) {
- this.motds = mL;
+ public void setMotds(List<Motd> motdList) {
+ this.motds = motdList;
}
@JsonView(View.Public.class)
@@ -102,8 +102,8 @@ public class ImportExportContainer {
return session.sessionFeature;
}
- public void setSessionFeature(RoomFeature sF) {
- session.sessionFeature = sF;
+ public void setSessionFeature(RoomFeature roomFeature) {
+ session.sessionFeature = roomFeature;
}
@JsonView(View.Public.class)
@@ -111,54 +111,54 @@ public class ImportExportContainer {
return sessionInfo;
}
- public void setSessionInfo(RoomInfo si) {
- sessionInfo = si;
+ public void setSessionInfo(RoomInfo roomInfo) {
+ sessionInfo = roomInfo;
}
public void setSessionFromSessionObject(Room s) {
- ImportExportRoom iesession = new ImportExportRoom();
- iesession.setName(s.getName());
- iesession.setShortName(s.getShortName());
- iesession.setActive(s.isActive());
+ ImportExportRoom importExportRoom = new ImportExportRoom();
+ importExportRoom.setName(s.getName());
+ importExportRoom.setShortName(s.getShortName());
+ importExportRoom.setActive(s.isActive());
PublicPool p = new PublicPool();
p.setPpFromSession(s);
- iesession.setPublicPool(p);
- iesession.sessionFeature = s.getFeatures();
- session = iesession;
+ importExportRoom.setPublicPool(p);
+ importExportRoom.sessionFeature = s.getFeatures();
+ session = importExportRoom;
}
- public void addQuestionWithAnswers(Content q, List<Answer> aL) {
- ImportExportContent ieq = new ImportExportContent(q);
- ieq.setAnswers(aL);
- questions.add(ieq);
+ public void addQuestionWithAnswers(Content content, List<Answer> answerList) {
+ ImportExportContent importExportContent = new ImportExportContent(content);
+ importExportContent.setAnswers(answerList);
+ questions.add(importExportContent);
}
public Room generateSessionEntity(ClientAuthentication user) {
- final Room s = new Room();
+ final Room room = new Room();
// import fields
- s.setActive(session.isActive());
+ room.setActive(session.isActive());
// overwrite name and shortname
- s.setName(session.getName());
- s.setShortName(session.getShortName());
+ room.setName(session.getName());
+ room.setShortName(session.getShortName());
// mark as public pool session
- s.setSessionType(session.getSessionType());
- s.setFeatures(session.getSessionFeature());
+ room.setSessionType(session.getSessionType());
+ room.setFeatures(session.getSessionFeature());
if (session.getPublicPool() != null) {
// set pool fields (which are also used as a session info)
- s.setPpAuthorMail(session.getPublicPool().getPpAuthorMail());
- s.setPpAuthorName(session.getPublicPool().getPpAuthorName());
- s.setPpDescription(session.getPublicPool().getPpDescription());
- s.setPpFaculty(session.getPublicPool().getPpFaculty());
- s.setPpLevel(session.getPublicPool().getPpLevel());
- s.setPpLicense(session.getPublicPool().getPpLicense());
- s.setPpLogo(session.getPublicPool().getPpLogo());
- s.setPpSubject(session.getPublicPool().getPpSubject());
- s.setPpUniversity(session.getPublicPool().getPpUniversity());
+ room.setPpAuthorMail(session.getPublicPool().getPpAuthorMail());
+ room.setPpAuthorName(session.getPublicPool().getPpAuthorName());
+ room.setPpDescription(session.getPublicPool().getPpDescription());
+ room.setPpFaculty(session.getPublicPool().getPpFaculty());
+ room.setPpLevel(session.getPublicPool().getPpLevel());
+ room.setPpLicense(session.getPublicPool().getPpLicense());
+ room.setPpLogo(session.getPublicPool().getPpLogo());
+ room.setPpSubject(session.getPublicPool().getPpSubject());
+ room.setPpUniversity(session.getPublicPool().getPpUniversity());
}
// other fields
- s.setCreator(user.getUsername());
- s.setCreationTime(new Date().getTime());
- return s;
+ room.setCreator(user.getUsername());
+ room.setCreationTime(new Date().getTime());
+ return room;
}
public static class ImportExportContent extends Content {
@@ -169,60 +169,60 @@ public class ImportExportContainer {
}
- public ImportExportContent(Content q) {
- setQuestionType(q.getQuestionType());
- setQuestionVariant(q.getQuestionVariant());
- setSubject(q.getSubject());
- setText(q.getText());
- setActive(q.isActive());
- setReleasedFor(q.getReleasedFor());
- setPossibleAnswers(q.getPossibleAnswers());
- setNoCorrect(q.isNoCorrect());
- setSessionId(q.getSessionId());
- setSessionKeyword(q.getSessionKeyword());
- setTimestamp(q.getTimestamp());
- setNumber(q.getNumber());
- setDuration(q.getDuration());
- setPiRound(q.getPiRound());
- setPiRoundEndTime(q.getPiRoundEndTime());
- setPiRoundStartTime(q.getPiRoundStartTime());
- setPiRoundFinished(q.isPiRoundFinished());
- setVotingDisabled(q.isVotingDisabled());
- setShowStatistic(q.isShowStatistic());
- setShowAnswer(q.isShowAnswer());
- setAbstention(q.isAbstention());
- setImage(q.getImage());
- setFcImage(q.getFcImage());
- setGridSize(q.getGridSize());
- setOffsetX(q.getOffsetX());
- setOffsetY(q.getOffsetY());
- setZoomLvl(q.getZoomLvl());
- setGridOffsetX(q.getGridOffsetX());
- setGridOffsetY(q.getGridOffsetY());
- setGridZoomLvl(q.getGridZoomLvl());
- setGridSizeX(q.getGridSizeX());
- setGridSizeY(q.getGridSizeY());
- setGridIsHidden(q.getGridIsHidden());
- setImgRotation(q.getImgRotation());
- setToggleFieldsLeft(q.getToggleFieldsLeft());
- setNumClickableFields(q.getNumClickableFields());
- setThresholdCorrectAnswers(q.getThresholdCorrectAnswers());
- setCvIsColored(q.getCvIsColored());
- setGridLineColor(q.getGridLineColor());
- setNumberOfDots(q.getNumberOfDots());
- setGridType(q.getGridType());
- setScaleFactor(q.getScaleFactor());
- setGridScaleFactor(q.getGridScaleFactor());
- setImageQuestion(q.isImageQuestion());
- setTextAnswerEnabled(q.isTextAnswerEnabled());
- setHint(q.getHint());
- setSolution(q.getSolution());
- setCorrectAnswer(q.getCorrectAnswer());
- setFixedAnswer(q.isFixedAnswer());
- setIgnoreCaseSensitive(q.isIgnoreCaseSensitive());
- setIgnorePunctuation(q.isIgnorePunctuation());
- setIgnoreWhitespaces(q.isIgnoreWhitespaces());
- setRating(q.getRating());
+ public ImportExportContent(Content content) {
+ setQuestionType(content.getQuestionType());
+ setQuestionVariant(content.getQuestionVariant());
+ setSubject(content.getSubject());
+ setText(content.getText());
+ setActive(content.isActive());
+ setReleasedFor(content.getReleasedFor());
+ setPossibleAnswers(content.getPossibleAnswers());
+ setNoCorrect(content.isNoCorrect());
+ setSessionId(content.getSessionId());
+ setSessionKeyword(content.getSessionKeyword());
+ setTimestamp(content.getTimestamp());
+ setNumber(content.getNumber());
+ setDuration(content.getDuration());
+ setPiRound(content.getPiRound());
+ setPiRoundEndTime(content.getPiRoundEndTime());
+ setPiRoundStartTime(content.getPiRoundStartTime());
+ setPiRoundFinished(content.isPiRoundFinished());
+ setVotingDisabled(content.isVotingDisabled());
+ setShowStatistic(content.isShowStatistic());
+ setShowAnswer(content.isShowAnswer());
+ setAbstention(content.isAbstention());
+ setImage(content.getImage());
+ setFcImage(content.getFcImage());
+ setGridSize(content.getGridSize());
+ setOffsetX(content.getOffsetX());
+ setOffsetY(content.getOffsetY());
+ setZoomLvl(content.getZoomLvl());
+ setGridOffsetX(content.getGridOffsetX());
+ setGridOffsetY(content.getGridOffsetY());
+ setGridZoomLvl(content.getGridZoomLvl());
+ setGridSizeX(content.getGridSizeX());
+ setGridSizeY(content.getGridSizeY());
+ setGridIsHidden(content.getGridIsHidden());
+ setImgRotation(content.getImgRotation());
+ setToggleFieldsLeft(content.getToggleFieldsLeft());
+ setNumClickableFields(content.getNumClickableFields());
+ setThresholdCorrectAnswers(content.getThresholdCorrectAnswers());
+ setCvIsColored(content.getCvIsColored());
+ setGridLineColor(content.getGridLineColor());
+ setNumberOfDots(content.getNumberOfDots());
+ setGridType(content.getGridType());
+ setScaleFactor(content.getScaleFactor());
+ setGridScaleFactor(content.getGridScaleFactor());
+ setImageQuestion(content.isImageQuestion());
+ setTextAnswerEnabled(content.isTextAnswerEnabled());
+ setHint(content.getHint());
+ setSolution(content.getSolution());
+ setCorrectAnswer(content.getCorrectAnswer());
+ setFixedAnswer(content.isFixedAnswer());
+ setIgnoreCaseSensitive(content.isIgnoreCaseSensitive());
+ setIgnorePunctuation(content.isIgnorePunctuation());
+ setIgnoreWhitespaces(content.isIgnoreWhitespaces());
+ setRating(content.getRating());
}
@ApiModelProperty(required = true, value = " used to display answers")
@@ -305,8 +305,8 @@ public class ImportExportContainer {
return this.sessionFeature;
}
- public void setSessionFeature(RoomFeature sF) {
- this.sessionFeature = sF;
+ public void setSessionFeature(RoomFeature roomFeature) {
+ this.sessionFeature = roomFeature;
}
}
@@ -334,18 +334,18 @@ public class ImportExportContainer {
private String shortName;
- public void setPpFromSession(Room s) {
- ppAuthorName = s.getPpAuthorName();
- ppAuthorMail = s.getPpAuthorMail();
- ppUniversity = s.getPpUniversity();
- ppLogo = s.getPpLogo();
- ppSubject = s.getPpSubject();
- ppLicense = s.getPpLicense();
- ppLevel = s.getPpLevel();
- ppDescription = s.getPpDescription();
- ppFaculty = s.getPpFaculty();
- name = s.getName();
- shortName = s.getShortName();
+ public void setPpFromSession(Room room) {
+ ppAuthorName = room.getPpAuthorName();
+ ppAuthorMail = room.getPpAuthorMail();
+ ppUniversity = room.getPpUniversity();
+ ppLogo = room.getPpLogo();
+ ppSubject = room.getPpSubject();
+ ppLicense = room.getPpLicense();
+ ppLevel = room.getPpLevel();
+ ppDescription = room.getPpDescription();
+ ppFaculty = room.getPpFaculty();
+ name = room.getName();
+ shortName = room.getShortName();
}
@ApiModelProperty(required = true, value = "used to display author name")
diff --git a/src/main/java/de/thm/arsnova/persistence/CrudRepository.java b/src/main/java/de/thm/arsnova/persistence/CrudRepository.java
index ba71213bb..fb7e741c2 100644
--- a/src/main/java/de/thm/arsnova/persistence/CrudRepository.java
+++ b/src/main/java/de/thm/arsnova/persistence/CrudRepository.java
@@ -26,7 +26,7 @@ package de.thm.arsnova.persistence;
*
* @author Daniel Gerhardt
*/
-public interface CrudRepository<T, ID> extends org.springframework.data.repository.CrudRepository<T, ID> {
+public interface CrudRepository<T, I> extends org.springframework.data.repository.CrudRepository<T, I> {
/**
*
* @param id The entity's Id
@@ -34,5 +34,5 @@ public interface CrudRepository<T, ID> extends org.springframework.data.reposito
* @deprecated Use {@link #findById(Object)} instead.
*/
@Deprecated
- T findOne(final ID id);
+ T findOne(final I id);
}
diff --git a/src/main/java/de/thm/arsnova/persistence/couchdb/CouchDbCommentRepository.java b/src/main/java/de/thm/arsnova/persistence/couchdb/CouchDbCommentRepository.java
index 3aca013ae..b2bbeb1e3 100644
--- a/src/main/java/de/thm/arsnova/persistence/couchdb/CouchDbCommentRepository.java
+++ b/src/main/java/de/thm/arsnova/persistence/couchdb/CouchDbCommentRepository.java
@@ -85,7 +85,8 @@ public class CouchDbCommentRepository extends CouchDbCrudRepository<Comment> imp
// {"key":["cecebabb21b096e592d81f9c1322b877","Guestc9350cf4a3","read"],"value":1},
// {"key":["cecebabb21b096e592d81f9c1322b877","Guestc9350cf4a3","unread"],"value":1}
// ]}
- int read = 0, unread = 0;
+ int read = 0;
+ int unread = 0;
boolean isRead = false;
final ViewResult.Row fst = viewResult.getRows().get(0);
final ViewResult.Row snd = viewResult.getRows().size() > 1 ? viewResult.getRows().get(1) : null;
diff --git a/src/main/java/de/thm/arsnova/persistence/couchdb/CouchDbStatisticsRepository.java b/src/main/java/de/thm/arsnova/persistence/couchdb/CouchDbStatisticsRepository.java
index f2f43fb2d..a00d3fe7d 100644
--- a/src/main/java/de/thm/arsnova/persistence/couchdb/CouchDbStatisticsRepository.java
+++ b/src/main/java/de/thm/arsnova/persistence/couchdb/CouchDbStatisticsRepository.java
@@ -77,6 +77,8 @@ public class CouchDbStatisticsRepository extends CouchDbRepositorySupport implem
case "flashcards":
stats.setFlashcards(stats.getFlashcards() + value);
break;
+ default:
+ break;
}
}
}
diff --git a/src/main/java/de/thm/arsnova/persistence/couchdb/migrations/V2ToV3Migration.java b/src/main/java/de/thm/arsnova/persistence/couchdb/migrations/V2ToV3Migration.java
index d1e9ccf67..cd376bce5 100644
--- a/src/main/java/de/thm/arsnova/persistence/couchdb/migrations/V2ToV3Migration.java
+++ b/src/main/java/de/thm/arsnova/persistence/couchdb/migrations/V2ToV3Migration.java
@@ -115,9 +115,9 @@ public class V2ToV3Migration implements Migration {
}
private void createV2Index() {
- List<MangoCouchDbConnector.MangoQuery.Sort> fields;
- Map<String, Object> filterSelector;
- Map<String, Object> subFilterSelector;
+ final List<MangoCouchDbConnector.MangoQuery.Sort> fields;
+ final Map<String, Object> filterSelector;
+ final Map<String, Object> subFilterSelector;
fields = new ArrayList<>();
fields.add(new MangoCouchDbConnector.MangoQuery.Sort("type", false));
@@ -130,35 +130,35 @@ public class V2ToV3Migration implements Migration {
subFilterSelector.put("$exists", false);
filterSelector.put("locked", subFilterSelector);
fromConnector.createPartialJsonIndex(USER_INDEX, new ArrayList<>(), filterSelector);
- fields = new ArrayList<>();
+ fields.clear();
fields.add(new MangoCouchDbConnector.MangoQuery.Sort("username", false));
fromConnector.createPartialJsonIndex(USER_INDEX, fields, filterSelector);
- filterSelector = new HashMap<>();
+ filterSelector.clear();
filterSelector.put("type", "logged_in");
fromConnector.createPartialJsonIndex(LOGGEDIN_INDEX, new ArrayList<>(), filterSelector);
- fields = new ArrayList<>();
+ fields.clear();
fields.add(new MangoCouchDbConnector.MangoQuery.Sort("user", false));
fromConnector.createPartialJsonIndex(LOGGEDIN_INDEX, fields, filterSelector);
- filterSelector = new HashMap<>();
+ filterSelector.clear();
filterSelector.put("type", "session");
fromConnector.createPartialJsonIndex(SESSION_INDEX, new ArrayList<>(), filterSelector);
- fields = new ArrayList<>();
+ fields.clear();
fields.add(new MangoCouchDbConnector.MangoQuery.Sort("keyword", false));
fromConnector.createPartialJsonIndex(SESSION_INDEX, fields, filterSelector);
- filterSelector = new HashMap<>();
+ filterSelector.clear();
filterSelector.put("type", "motd");
fromConnector.createPartialJsonIndex(MOTD_INDEX, new ArrayList<>(), filterSelector);
- fields = new ArrayList<>();
+ fields.clear();
fields.add(new MangoCouchDbConnector.MangoQuery.Sort("motdkey", false));
fromConnector.createPartialJsonIndex(MOTD_INDEX, fields, filterSelector);
- filterSelector = new HashMap<>();
+ filterSelector.clear();
filterSelector.put("type", "motdlist");
fromConnector.createPartialJsonIndex(MOTDLIST_INDEX, new ArrayList<>(), filterSelector);
- fields = new ArrayList<>();
+ fields.clear();
fields.add(new MangoCouchDbConnector.MangoQuery.Sort("username", false));
fromConnector.createPartialJsonIndex(MOTDLIST_INDEX, fields, filterSelector);
}
diff --git a/src/main/java/de/thm/arsnova/security/jwt/JwtAuthenticationProvider.java b/src/main/java/de/thm/arsnova/security/jwt/JwtAuthenticationProvider.java
index 2b743b994..5a379c181 100644
--- a/src/main/java/de/thm/arsnova/security/jwt/JwtAuthenticationProvider.java
+++ b/src/main/java/de/thm/arsnova/security/jwt/JwtAuthenticationProvider.java
@@ -37,8 +37,8 @@ public class JwtAuthenticationProvider implements AuthenticationProvider {
}
@Override
- public boolean supports(final Class<?> aClass) {
- return JwtToken.class.isAssignableFrom(aClass);
+ public boolean supports(final Class<?> authentication) {
+ return JwtToken.class.isAssignableFrom(authentication);
}
@Autowired
diff --git a/src/main/java/de/thm/arsnova/security/pac4j/OauthAuthenticationProvider.java b/src/main/java/de/thm/arsnova/security/pac4j/OauthAuthenticationProvider.java
index 6cbe8f9d2..6e9c208fd 100644
--- a/src/main/java/de/thm/arsnova/security/pac4j/OauthAuthenticationProvider.java
+++ b/src/main/java/de/thm/arsnova/security/pac4j/OauthAuthenticationProvider.java
@@ -38,15 +38,15 @@ public class OauthAuthenticationProvider implements AuthenticationProvider {
@Override
public Authentication authenticate(final Authentication authentication) throws AuthenticationException {
- OAuthToken oAuthToken = (OAuthToken) authentication;
- User user = oauthUserDetailsService.loadUserDetails(oAuthToken);
+ OAuthToken oauthToken = (OAuthToken) authentication;
+ User user = oauthUserDetailsService.loadUserDetails(oauthToken);
- return new OAuthToken(user, (CommonProfile) oAuthToken.getDetails(), user.getAuthorities());
+ return new OAuthToken(user, (CommonProfile) oauthToken.getDetails(), user.getAuthorities());
}
@Override
- public boolean supports(final Class<?> aClass) {
- return aClass.isAssignableFrom(OAuthToken.class);
+ public boolean supports(final Class<?> authentication) {
+ return authentication.isAssignableFrom(OAuthToken.class);
}
@Autowired
diff --git a/src/main/java/de/thm/arsnova/service/MotdServiceImpl.java b/src/main/java/de/thm/arsnova/service/MotdServiceImpl.java
index 119c97051..13b2abcf3 100644
--- a/src/main/java/de/thm/arsnova/service/MotdServiceImpl.java
+++ b/src/main/java/de/thm/arsnova/service/MotdServiceImpl.java
@@ -80,11 +80,20 @@ public class MotdServiceImpl extends DefaultEntityServiceImpl<Motd> implements M
public List<Motd> getCurrentMotds(final Date clientdate, final String audience) {
final List<Motd> motds;
switch (audience) {
- case "all": motds = motdRepository.findGlobalForAll(); break;
- case "loggedIn": motds = motdRepository.findGlobalForLoggedIn(); break;
- case "students": motds = motdRepository.findForStudents(); break;
- case "tutors": motds = motdRepository.findGlobalForTutors(); break;
- default: throw new IllegalArgumentException("Invalid audience.");
+ case "all":
+ motds = motdRepository.findGlobalForAll();
+ break;
+ case "loggedIn":
+ motds = motdRepository.findGlobalForLoggedIn();
+ break;
+ case "students":
+ motds = motdRepository.findForStudents();
+ break;
+ case "tutors":
+ motds = motdRepository.findGlobalForTutors();
+ break;
+ default:
+ throw new IllegalArgumentException("Invalid audience.");
}
return filterMotdsByDate(motds, clientdate);
diff --git a/src/main/java/de/thm/arsnova/service/RoomServiceImpl.java b/src/main/java/de/thm/arsnova/service/RoomServiceImpl.java
index 60d677448..8fb29b28d 100644
--- a/src/main/java/de/thm/arsnova/service/RoomServiceImpl.java
+++ b/src/main/java/de/thm/arsnova/service/RoomServiceImpl.java
@@ -154,7 +154,7 @@ public class RoomServiceImpl extends DefaultEntityServiceImpl<Room> implements R
logger.info("Delete inactive rooms.");
long unixTime = System.currentTimeMillis();
long lastActivityBefore = unixTime - guestRoomInactivityThresholdDays * 24 * 60 * 60 * 1000L;
- int totalCount[] = new int[] {0, 0, 0};
+ int[] totalCount = new int[] {0, 0, 0};
List<Room> inactiveRooms = roomRepository.findInactiveGuestRoomsMetadata(lastActivityBefore);
delete(inactiveRooms);
@@ -172,18 +172,18 @@ public class RoomServiceImpl extends DefaultEntityServiceImpl<Room> implements R
@Override
protected void modifyRetrieved(final Room room) {
// creates a set from all room content groups
- Set<String> cIdsWithGroup = room.getContentGroups().stream()
+ Set<String> cidsWithGroup = room.getContentGroups().stream()
.map(Room.ContentGroup::getContentIds)
.flatMap(ids -> ids.stream())
.collect(Collectors.toSet());
- Set<String> cIds = new HashSet<>(contentRepository.findIdsByRoomId(room.getId()));
- cIds.removeAll(cIdsWithGroup);
+ Set<String> cids = new HashSet<>(contentRepository.findIdsByRoomId(room.getId()));
+ cids.removeAll(cidsWithGroup);
- if (!cIds.isEmpty()) {
- Set<Room.ContentGroup> cgs = room.getContentGroups();
+ if (!cids.isEmpty()) {
+ final Set<Room.ContentGroup> cgs = room.getContentGroups();
Room.ContentGroup defaultGroup = new Room.ContentGroup();
- defaultGroup.setContentIds(cIds);
+ defaultGroup.setContentIds(cids);
defaultGroup.setAutoSort(true);
defaultGroup.setName("");
cgs.add(defaultGroup);
diff --git a/src/main/java/de/thm/arsnova/service/UserServiceImpl.java b/src/main/java/de/thm/arsnova/service/UserServiceImpl.java
index 8cdfdb814..98a93c5b7 100644
--- a/src/main/java/de/thm/arsnova/service/UserServiceImpl.java
+++ b/src/main/java/de/thm/arsnova/service/UserServiceImpl.java
@@ -667,9 +667,14 @@ public class UserServiceImpl extends DefaultEntityServiceImpl<UserProfile> imple
public User getAuthenticatedUserByWsSession(final String wsSessionId) {
String jwt = wsSessionIdToJwt.getOrDefault(wsSessionId, null);
- if (jwt == null) return null;
+ if (jwt == null) {
+ return null;
+ }
User u = jwtService.verifyToken(jwt);
- if (u == null) return null;
+ if (u == null) {
+ return null;
+ }
+
return u;
}
}
diff --git a/src/main/java/de/thm/arsnova/util/ImageUtils.java b/src/main/java/de/thm/arsnova/util/ImageUtils.java
index 531ff35e1..2032ffd62 100644
--- a/src/main/java/de/thm/arsnova/util/ImageUtils.java
+++ b/src/main/java/de/thm/arsnova/util/ImageUtils.java
@@ -175,7 +175,10 @@ public class ImageUtils {
final double ratio = ((double) originalImage.getWidth()) / ((double) originalImage.getHeight());
- int x = 0, y = 0, w = width, h = height;
+ int x = 0;
+ int y = 0;
+ int w = width;
+ int h = height;
if (originalImage.getWidth() > originalImage.getHeight()) {
final int newWidth = (int) Math.round((float) height * ratio);
x = -(newWidth - width) >> 1;
diff --git a/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServer.java b/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServer.java
index 64c30a521..220f12925 100644
--- a/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServer.java
+++ b/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServer.java
@@ -25,7 +25,7 @@ package de.thm.arsnova.websocket;
*/
public interface ArsnovaSocketioServer {
- boolean isUseSSL();
+ boolean isUseSsl();
int getPortNumber();
diff --git a/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServerImpl.java b/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServerImpl.java
index 473235e8c..2bd266d5f 100644
--- a/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServerImpl.java
+++ b/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServerImpl.java
@@ -105,7 +105,7 @@ public class ArsnovaSocketioServerImpl implements ArsnovaSocketioServer {
private int portNumber;
private String hostIp;
- private boolean useSSL = false;
+ private boolean useSsl = false;
private String keystore;
private String storepass;
private final Configuration config;
@@ -140,7 +140,7 @@ public class ArsnovaSocketioServerImpl implements ArsnovaSocketioServer {
config.setSocketConfig(soConfig);
config.setPort(portNumber);
config.setHostname(hostIp);
- if (useSSL) {
+ if (useSsl) {
try {
final InputStream stream = new FileInputStream(keystore);
config.setKeyStore(stream);
@@ -341,13 +341,13 @@ public class ArsnovaSocketioServerImpl implements ArsnovaSocketioServer {
}
@Override
- public boolean isUseSSL() {
- return useSSL;
+ public boolean isUseSsl() {
+ return useSsl;
}
@Required
- public void setUseSSL(final boolean useSSL) {
- this.useSSL = useSSL;
+ public void setUseSsl(final boolean useSsl) {
+ this.useSsl = useSsl;
}
public void reportDeletedFeedback(final String userId, final Set<de.thm.arsnova.model.Room> rooms) {
@@ -471,7 +471,7 @@ public class ArsnovaSocketioServerImpl implements ArsnovaSocketioServer {
/* TODO role handling implementation, send this only to users with role audience */
if (!qs.isEmpty()) {
- broadcastInRoom(roomId, "lecQuestionAvail", contents.get(0).get_id()); // deprecated!
+ broadcastInRoom(roomId, "lecQuestionAvail", contents.get(0).getId()); // deprecated!
}
broadcastInRoom(roomId, "lecturerQuestionAvailable", contents);
}
diff --git a/src/main/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandler.java b/src/main/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandler.java
index e3e6f430c..06b6f33f0 100644
--- a/src/main/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandler.java
+++ b/src/main/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandler.java
@@ -22,7 +22,7 @@ public class FeedbackCommandHandler {
this.messagingTemplate = messagingTemplate;
}
- synchronized private int[] updateFeedbackForRoom(String roomId, int index) {
+ private synchronized int[] updateFeedbackForRoom(String roomId, int index) {
int[] values = roomValues.getOrDefault(roomId, new int[4]);
values[index]++;
roomValues.put(roomId, values);
diff --git a/src/main/java/de/thm/arsnova/websocket/message/Content.java b/src/main/java/de/thm/arsnova/websocket/message/Content.java
index 5ccc1c236..243349e9c 100644
--- a/src/main/java/de/thm/arsnova/websocket/message/Content.java
+++ b/src/main/java/de/thm/arsnova/websocket/message/Content.java
@@ -18,22 +18,25 @@
package de.thm.arsnova.websocket.message;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
/**
* Represents a question.
*/
public class Content {
- private final String _id;
+ private final String id;
private final String variant;
public Content(de.thm.arsnova.model.Content content) {
- this._id = content.getId();
+ this.id = content.getId();
/* FIXME: Message does not support content with multiple groups */
this.variant = content.getGroups().toArray(new String[1])[0];
}
- public String get_id() {
- return _id;
+ @JsonProperty("_id")
+ public String getId() {
+ return id;
}
public String getVariant() {
diff --git a/src/main/java/de/thm/arsnova/websocket/message/FeedbackChanged.java b/src/main/java/de/thm/arsnova/websocket/message/FeedbackChanged.java
index 8b0c6e62e..2e7414358 100644
--- a/src/main/java/de/thm/arsnova/websocket/message/FeedbackChanged.java
+++ b/src/main/java/de/thm/arsnova/websocket/message/FeedbackChanged.java
@@ -7,8 +7,12 @@ public class FeedbackChanged extends WebSocketMessage<FeedbackChangedPayload> {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
FeedbackChanged that = (FeedbackChanged) o;
return this.getPayload().equals(that.getPayload());
}
diff --git a/src/main/java/de/thm/arsnova/websocket/message/FeedbackChangedPayload.java b/src/main/java/de/thm/arsnova/websocket/message/FeedbackChangedPayload.java
index cb7e738ba..29278f468 100644
--- a/src/main/java/de/thm/arsnova/websocket/message/FeedbackChangedPayload.java
+++ b/src/main/java/de/thm/arsnova/websocket/message/FeedbackChangedPayload.java
@@ -15,8 +15,12 @@ public class FeedbackChangedPayload implements WebSocketPayload {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
FeedbackChangedPayload that = (FeedbackChangedPayload) o;
return Arrays.equals(values, that.values);
}
--
GitLab