Use short syntax for empty collections

Author: Brutus5000

src/inttest/java/com/faforever/api/moderationreport/ModerationReportTest.java

@@ -15,7 +15,6 @@
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
 
-import java.util.Collections;
 import java.util.Set;
 
 import static com.faforever.api.data.JsonApiMediaType.JSON_API_MEDIA_TYPE;
@@ -375,7 +374,7 @@ public void userCanSeeOnlyOwnReports() throws Exception {
   @Test
   public void cannotUpdateReportedUsers() throws Exception {
     final ModerationReport updatedReportedUsersModerationReport = (ModerationReport) new ModerationReport()
-      .setReportedUsers(Collections.emptySet())
+      .setReportedUsers(Set.of())
       .setId("3");
     mockMvc.perform(
       patch("/data/moderationReport/3")

src/main/java/com/faforever/api/config/elide/ElideConfig.java

@@ -21,7 +21,7 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.time.OffsetDateTime;
-import java.util.Collections;
+import java.util.Map;
 
 @Configuration
 public class ElideConfig {
@@ -81,7 +81,7 @@ public <T> T convert(Class<T> type, Object value) {
 
   @Bean
   public EntityDictionary entityDictionary(AutowireCapableBeanFactory beanFactory) {
-    final EntityDictionary entityDictionary = new EntityDictionary(Collections.emptyMap(), new Injector() {
+    final EntityDictionary entityDictionary = new EntityDictionary(Map.of(), new Injector() {
       @Override
       public void inject(Object entity) {
         beanFactory.autowireBean(entity);

src/main/java/com/faforever/api/security/FafMultiTokenStore.java

@@ -15,7 +15,7 @@
 import org.springframework.stereotype.Component;
 
 import java.util.Collection;
-import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -112,12 +112,12 @@ public OAuth2AccessToken getAccessToken(OAuth2Authentication authentication) {
   @Override
   public Collection<OAuth2AccessToken> findTokensByClientIdAndUserName(String clientId, String userName) {
     // equal to JwtTokenStore
-    return Collections.emptySet();
+    return List.of();
   }
 
   @Override
   public Collection<OAuth2AccessToken> findTokensByClientId(String clientId) {
     // equal to JwtTokenStore
-    return Collections.emptySet();
+    return List.of();
   }
 }

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

@@ -16,10 +16,10 @@
 import javax.transaction.Transactional;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 
 @Service
 public class VotingService {
@@ -42,7 +42,7 @@ public void saveVote(Vote vote, Player player) {
     List<Error> errors = ableToVote(player, vote.getVotingSubject().getId());
 
     if (vote.getVotingAnswers() == null) {
-      vote.setVotingAnswers(Collections.emptySet());
+      vote.setVotingAnswers(Set.of());
     }
 
     VotingSubject subject = votingSubjectRepository.findById(vote.getVotingSubject().getId())

src/test/java/com/faforever/api/deployment/LegacyFeaturedModDeploymentTaskTest.java

@@ -22,7 +22,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -100,7 +99,7 @@ public void testRunNoFileIds() throws Exception {
     when(featuredModService.getFeaturedMods()).thenReturn(List.of(
       new FeaturedMod().setTechnicalName("faf")
     ));
-    when(featuredModService.getFileIds("faf")).thenReturn(Collections.emptyMap());
+    when(featuredModService.getFileIds("faf")).thenReturn(Map.of());
 
     Path dummyExe = repositoriesFolder.resolve("TemplateForgedAlliance.exe");
     createDummyExe(dummyExe);

src/test/java/com/faforever/api/security/FafTokenServiceTest.java

@@ -16,7 +16,6 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.Duration;
-import java.util.Collections;
 import java.util.Map;
 
 import static com.faforever.api.error.ApiExceptionMatcher.hasErrorCode;
@@ -83,7 +82,7 @@ public void setUp() throws Exception {
 
   @Test
   public void createToken() throws Exception {
-    String token = instance.createToken(FafTokenType.REGISTRATION, Duration.ofSeconds(100), Collections.emptyMap());
+    String token = instance.createToken(FafTokenType.REGISTRATION, Duration.ofSeconds(100), Map.of());
 
     Jwt jwt = JwtHelper.decodeAndVerify(token, rsaVerifier);
     Map<String, String> claims = objectMapper.readValue(jwt.getClaims(), new TypeReference<Map<String, String>>() {
@@ -113,7 +112,7 @@ public void createTokenWithAttributes() throws Exception {
 
   @Test
   public void resolveToken() {
-    String token = instance.createToken(FafTokenType.REGISTRATION, Duration.ofSeconds(100), Collections.emptyMap());
+    String token = instance.createToken(FafTokenType.REGISTRATION, Duration.ofSeconds(100), Map.of());
     Map<String, String> result = instance.resolveToken(FafTokenType.REGISTRATION, token);
 
     assertThat(result.size(), is(0));
@@ -133,15 +132,15 @@ public void resolveTokenWithAttributes() {
 
   @Test
   public void resolveTokenExpired() {
-    String token = instance.createToken(FafTokenType.REGISTRATION, Duration.ofSeconds(-1), Collections.emptyMap());
+    String token = instance.createToken(FafTokenType.REGISTRATION, Duration.ofSeconds(-1), Map.of());
 
     ApiException result = assertThrows(ApiException.class, () -> instance.resolveToken(FafTokenType.REGISTRATION, token));
     assertThat(result, hasErrorCode(ErrorCode.TOKEN_EXPIRED));
   }
 
   @Test
   public void resolveTokenInvalidType() {
-    String token = instance.createToken(FafTokenType.REGISTRATION, Duration.ofSeconds(-1), Collections.emptyMap());
+    String token = instance.createToken(FafTokenType.REGISTRATION, Duration.ofSeconds(-1), Map.of());
 
     ApiException result = assertThrows(ApiException.class, () -> instance.resolveToken(FafTokenType.PASSWORD_RESET, token));
     assertThat(result, hasErrorCode(ErrorCode.TOKEN_INVALID));