More @requiredargsconstructor, more records, fix HashSets

Author: Brutus5000

src/main/java/com/faforever/api/mautic/MauticApiErrorHandler.java

@@ -1,6 +1,8 @@
 package com.faforever.api.mautic;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.DefaultResponseErrorHandler;
@@ -9,19 +11,16 @@
 import java.io.InputStream;
 
 @Component
+@RequiredArgsConstructor
 public class MauticApiErrorHandler extends DefaultResponseErrorHandler {
 
   private final ObjectMapper objectMapper;
 
-  public MauticApiErrorHandler(ObjectMapper objectMapper) {
-    this.objectMapper = objectMapper;
-  }
-
   @Override
-  public void handleError(ClientHttpResponse response) throws IOException {
+  public void handleError(@NotNull ClientHttpResponse response) throws IOException {
     try (InputStream inputStream = response.getBody()) {
       MauticErrorResponse errorResponse = objectMapper.readValue(inputStream, MauticErrorResponse.class);
-      throw new MauticApiException(errorResponse.getErrors());
+      throw new MauticApiException(errorResponse.errors());
     }
   }
 }

src/main/java/com/faforever/api/mautic/MauticErrorResponse.java

@@ -1,20 +1,14 @@
 package com.faforever.api.mautic;
 
-import lombok.Data;
-import lombok.ToString;
-
 import java.util.List;
 import java.util.Map;
 
-@Data
-public class MauticErrorResponse {
-  private List<Error> errors;
+record MauticErrorResponse(List<Error> errors) {
 
-  @Data
-  @ToString
-  public static class Error {
-    private int code;
-    private String message;
-    private Map<String, Object> details;
+  static record Error(
+    int code,
+    String message,
+    Map<String, Object> details
+  ) {
   }
 }

src/main/java/com/faforever/api/mod/ModService.java

@@ -15,6 +15,7 @@
 import com.faforever.commons.io.Unzipper;
 import com.faforever.commons.mod.ModReader;
 import com.google.common.primitives.Ints;
+import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
@@ -44,6 +45,7 @@
 
 @Service
 @Slf4j
+@RequiredArgsConstructor
 public class ModService {
 
   /** Legacy path prefix put in front of every mod file. This should be eliminated ASAP. */
@@ -52,12 +54,6 @@ public class ModService {
   private final ModRepository modRepository;
   private final ModVersionRepository modVersionRepository;
 
-  public ModService(FafApiProperties properties, ModRepository modRepository, ModVersionRepository modVersionRepository) {
-    this.properties = properties;
-    this.modRepository = modRepository;
-    this.modVersionRepository = modVersionRepository;
-  }
-
   @SneakyThrows
   @Transactional
   @CacheEvict(value = {Mod.TYPE_NAME, ModVersion.TYPE_NAME}, allEntries = true)

src/main/java/com/faforever/api/mod/ModsController.java

@@ -7,6 +7,7 @@
 import com.faforever.api.player.PlayerService;
 import com.google.common.io.Files;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -21,18 +22,13 @@
 
 @RestController
 @RequestMapping(path = "/mods")
+@RequiredArgsConstructor
 public class ModsController {
 
   private final PlayerService playerService;
   private final ModService modService;
   private final FafApiProperties fafApiProperties;
 
-  public ModsController(PlayerService playerService, ModService modService, FafApiProperties fafApiProperties) {
-    this.playerService = playerService;
-    this.modService = modService;
-    this.fafApiProperties = fafApiProperties;
-  }
-
   @ApiOperation("Upload a mod")
   @RequestMapping(path = "/upload", method = RequestMethod.POST, produces = APPLICATION_JSON_UTF8_VALUE)
   public void uploadMod(@RequestParam("file") MultipartFile file, Authentication authentication) throws IOException {

src/main/java/com/faforever/api/user/MeController.java

@@ -10,6 +10,7 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import lombok.Builder;
+import lombok.RequiredArgsConstructor;
 import lombok.Value;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.core.GrantedAuthority;
@@ -27,13 +28,10 @@
  * Provides the route {@code /me} which returns the currently logged in user's information.
  */
 @RestController
+@RequiredArgsConstructor
 public class MeController {
   private final PlayerService playerService;
 
-  public MeController(PlayerService playerService) {
-    this.playerService = playerService;
-  }
-
   @RequestMapping(method = RequestMethod.GET, value = "/me")
   @ApiOperation("Returns the authentication object of the current user")
   @ApiResponse(code = 200, message = "Success with JsonApi compliant MeResult")

src/main/java/com/faforever/api/voting/VotingService.java

@@ -10,6 +10,7 @@
 import com.faforever.api.error.Error;
 import com.faforever.api.error.ErrorCode;
 import com.faforever.api.game.GamePlayerStatsRepository;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
@@ -22,19 +23,13 @@
 import java.util.Set;
 
 @Service
+@RequiredArgsConstructor
 public class VotingService {
   private final VoteRepository voteRepository;
   private final VotingSubjectRepository votingSubjectRepository;
   private final GamePlayerStatsRepository gamePlayerStatsRepository;
   private final VotingChoiceRepository votingChoiceRepository;
 
-  public VotingService(VoteRepository voteRepository, VotingSubjectRepository votingSubjectRepository, GamePlayerStatsRepository gamePlayerStatsRepository, VotingChoiceRepository votingChoiceRepository) {
-    this.voteRepository = voteRepository;
-    this.votingSubjectRepository = votingSubjectRepository;
-    this.gamePlayerStatsRepository = gamePlayerStatsRepository;
-    this.votingChoiceRepository = votingChoiceRepository;
-  }
-
   @Transactional
   public void saveVote(Vote vote, Player player) {
     vote.setPlayer(player);

src/test/java/com/faforever/api/data/listeners/VotingSubjectEnricherTest.java

@@ -15,6 +15,7 @@
 import org.springframework.context.support.MessageSourceAccessor;
 
 import java.time.OffsetDateTime;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -308,20 +309,20 @@ private void addAnswerToChoice(VotingChoice votingChoice, VotingQuestion votingQ
     if (vote.getVotingAnswers() != null) {
       vote.getVotingAnswers().add(votingAnswer);
     } else {
-      vote.setVotingAnswers(Set.of(votingAnswer));
+      vote.setVotingAnswers(new HashSet<>(Set.of(votingAnswer)));
     }
 
     if (votingChoice != null) {
       if (votingChoice.getVotingAnswers() != null) {
         votingChoice.getVotingAnswers().add(votingAnswer);
       } else {
-        votingChoice.setVotingAnswers(Set.of(votingAnswer));
+        votingChoice.setVotingAnswers(new HashSet<>(Set.of(votingAnswer)));
       }
 
       if (votingQuestion.getVotingChoices() != null) {
         votingQuestion.getVotingChoices().add(votingChoice);
       } else {
-        votingQuestion.setVotingChoices(Set.of(votingChoice));
+        votingQuestion.setVotingChoices(new HashSet<>(Set.of(votingChoice)));
       }
     }
   }