Don't create new HashSets, also use Hamcrest assertThat

Author: Brutus5000

src/inttest/java/com/faforever/api/data/ClanElideTest.java

@@ -19,12 +19,12 @@
 import java.util.List;
 import java.util.Optional;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;

src/inttest/java/com/faforever/api/data/UserNoteTest.java

@@ -11,9 +11,9 @@
 import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
 
 import static com.faforever.api.data.JsonApiMediaType.JSON_API_MEDIA_TYPE;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;

src/test/java/com/faforever/api/achievements/PlayerAchievementsControllerTest.java

@@ -9,8 +9,8 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
-import static org.junit.Assert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;

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

@@ -7,7 +7,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class ClanEnricherListenerTest {
   private ClanEnricherListener instance;

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

@@ -10,7 +10,7 @@
 import org.springframework.context.support.MessageSourceAccessor;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 @ExtendWith(MockitoExtension.class)
 public class TutorialEnricherTest {

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

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

src/test/java/com/faforever/api/email/JavaEmailSenderTest.java

@@ -15,7 +15,7 @@
 import javax.mail.internet.MimeMessage;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.verify;
 
 @ExtendWith(MockitoExtension.class)

src/test/java/com/faforever/api/leaderboard/LeaderboardControllerTest.java

@@ -16,8 +16,8 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
-import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)

src/test/java/com/faforever/api/leaderboard/LeaderboardServiceTest.java

@@ -12,7 +12,7 @@
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

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

@@ -3,8 +3,8 @@
 import com.faforever.api.client.OAuthClient;
 import com.faforever.api.client.OAuthClientRepository;
 import com.faforever.api.config.FafApiProperties;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -15,7 +15,7 @@
 import java.util.Optional;
 
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)