Polishing

FAForever · Jul 25, 2018 · 5e6c7ee · 5e6c7ee
1 parent 37c4963
commit 5e6c7ee
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/src/inttest/java/com/faforever/api/AbstractIntegrationTest.java b/src/inttest/java/com/faforever/api/AbstractIntegrationTest.java
@@ -33,7 +33,7 @@
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @ActiveProfiles(ApplicationProfile.INTEGRATION_TEST)
-@Import({OAuthHelper.class})
+@Import(OAuthHelper.class)
 @Transactional
 @Sql(executionPhase = ExecutionPhase.BEFORE_TEST_METHOD, scripts = "classpath:sql/prepDefaultUser.sql")
 public abstract class AbstractIntegrationTest {

diff --git a/src/inttest/java/com/faforever/api/clan/ClanControllerTest.java b/src/inttest/java/com/faforever/api/clan/ClanControllerTest.java
@@ -67,7 +67,7 @@ public void meDataWithoutClan() throws Exception {
   @WithUserDetails(AUTH_CLAN_MEMBER)
   public void meDataWithClan() throws Exception {
     Player player = getPlayer();
-    Clan clan = clanRepository.findById(1).get();
+    Clan clan = clanRepository.getOne(1);
 
     mockMvc.perform(
       get("/clans/me/"))

diff --git a/src/inttest/java/com/faforever/api/data/AvatarElideTest.java b/src/inttest/java/com/faforever/api/data/AvatarElideTest.java
@@ -39,7 +39,7 @@ public class AvatarElideTest extends AbstractIntegrationTest {
 
   @Test
   public void getUnusedAvatar() throws Exception {
-    Avatar avatar = avatarRepository.findById(1).get();
+    Avatar avatar = avatarRepository.getOne(1);
 
     mockMvc.perform(get("/data/avatar/1"))
       .andExpect(status().isOk())
@@ -52,7 +52,7 @@ public void getUnusedAvatar() throws Exception {
 
   @Test
   public void getAvatarWithPlayer() throws Exception {
-    Avatar avatar = avatarRepository.findById(2).get();
+    Avatar avatar = avatarRepository.getOne(2);
 
     mockMvc.perform(get("/data/avatar/2"))
       .andExpect(status().isOk())

diff --git a/src/inttest/java/com/faforever/api/data/ClanElideTest.java b/src/inttest/java/com/faforever/api/data/ClanElideTest.java
@@ -46,12 +46,12 @@ public class ClanElideTest extends AbstractIntegrationTest {
   @Test
   @WithUserDetails(AUTH_CLAN_LEADER)
   public void canDeleteMemberOfOwnClan() throws Exception {
-    assertNotNull(playerRepository.findById(12).get().getClan());
+    assertNotNull(playerRepository.getOne(12).getClan());
 
     mockMvc.perform(
       delete("/data/clanMembership/2")) // magic value from prepClanData.sql
       .andExpect(status().isNoContent());
-    assertNull(playerRepository.findById(12).get().getClan());
+    assertNull(playerRepository.getOne(12).getClan());
   }
 
   @Test
@@ -75,13 +75,13 @@ public void cannotDeleteLeaderFromClan() throws Exception {
   @Test
   @WithUserDetails(AUTH_CLAN_MEMBER)
   public void canLeaveClan() throws Exception {
-    assertNotNull(playerRepository.findById(12).get().getClan());
+    assertNotNull(playerRepository.getOne(12).getClan());
 
     mockMvc.perform(
       delete("/data/clanMembership/2")) // magic value from prepClanData.sql
       .andExpect(status().isNoContent());
 
-    assertNull(playerRepository.findById(12).get().getClan());
+    assertNull(playerRepository.getOne(12).getClan());
   }
 
   @Test
@@ -105,28 +105,28 @@ public void getFilteredPlayerForClanInvite() throws Exception {
   @Test
   @WithUserDetails(AUTH_CLAN_LEADER)
   public void canTransferLeadershipAsLeader() throws Exception {
-    assertThat(clanRepository.findById(1).get().getLeader().getLogin(), is(AUTH_CLAN_LEADER));
+    assertThat(clanRepository.getOne(1).getLeader().getLogin(), is(AUTH_CLAN_LEADER));
 
     mockMvc.perform(
       patch("/data/clan/1")
         .content(generateTransferLeadershipContent(1, 12))) // magic value from prepClanData.sql
       .andExpect(status().isNoContent());
 
-    assertThat(clanRepository.findById(1).get().getLeader().getLogin(), is(AUTH_CLAN_MEMBER));
+    assertThat(clanRepository.getOne(1).getLeader().getLogin(), is(AUTH_CLAN_MEMBER));
   }
 
   @Test
   @WithUserDetails(AUTH_CLAN_MEMBER)
   public void cannotTransferLeadershipAsMember() throws Exception {
-    assertThat(clanRepository.findById(1).get().getLeader().getLogin(), is(AUTH_CLAN_LEADER));
+    assertThat(clanRepository.getOne(1).getLeader().getLogin(), is(AUTH_CLAN_LEADER));
 
     mockMvc.perform(
       patch("/data/clan/1")
         .content(generateTransferLeadershipContent(1, 12))) // magic value from prepClanData.sql
       .andExpect(status().isForbidden())
       .andExpect(jsonPath("$.errors[0]", is("ForbiddenAccessException")));
 
-    assertThat(clanRepository.findById(1).get().getLeader().getLogin(), is(AUTH_CLAN_LEADER));
+    assertThat(clanRepository.getOne(1).getLeader().getLogin(), is(AUTH_CLAN_LEADER));
   }
 
   @Test
@@ -174,7 +174,7 @@ public void canDeleteClanAsLeader() throws Exception {
       .andExpect(status().isNoContent()); // TODO: Catch javax.validation.ConstraintViolationException and wrap it into a regular ApiException
 
     assertFalse(clanRepository.findOneByName("Alpha Clan").isPresent());
-    clanMember.forEach(player -> assertNull(playerRepository.findById(player.getId()).get().getClan()));
+    clanMember.forEach(player -> assertNull(playerRepository.getOne(player.getId()).getClan()));
   }
 
   @Test

diff --git a/src/inttest/java/com/faforever/api/user/UsersControllerTest.java b/src/inttest/java/com/faforever/api/user/UsersControllerTest.java
@@ -317,7 +317,7 @@ public void buildSteamLinkUrl() throws Exception {
   @Test
   @WithAnonymousUser
   public void linkToSteam() throws Exception {
-    assertThat(userRepository.findById(1).get().getSteamId(), nullValue());
+    assertThat(userRepository.getOne(1).getSteamId(), nullValue());
 
     String steamId = "1234";
     String callbackUrl = "callbackUrl";
@@ -337,7 +337,7 @@ public void linkToSteam() throws Exception {
       .andExpect(status().isFound())
       .andExpect(redirectedUrl(callbackUrl));
 
-    assertThat(userRepository.findById(2).get().getSteamId(), is(steamId));
+    assertThat(userRepository.getOne(2).getSteamId(), is(steamId));
   }
 
   @Test
@@ -367,7 +367,7 @@ public void changeUsernameWithWrongScope() throws Exception {
   @Test
   @WithUserDetails(AUTH_USER)
   public void changeUsernameSuccess() throws Exception {
-    assertThat(userRepository.findById(1).get().getLogin(), is(AUTH_USER));
+    assertThat(userRepository.getOne(1).getLogin(), is(AUTH_USER));
 
     MultiValueMap<String, String> params = new HttpHeaders();
     params.add("newUsername", NEW_USER);
@@ -378,13 +378,13 @@ public void changeUsernameSuccess() throws Exception {
         .params(params))
       .andExpect(status().isOk());
 
-    assertThat(userRepository.findById(1).get().getLogin(), is(NEW_USER));
+    assertThat(userRepository.getOne(1).getLogin(), is(NEW_USER));
   }
 
   @Test
   @WithUserDetails(AUTH_MODERATOR)
   public void changeUsernameTooEarly() throws Exception {
-    assertThat(userRepository.findById(2).get().getLogin(), is(AUTH_MODERATOR));
+    assertThat(userRepository.getOne(2).getLogin(), is(AUTH_MODERATOR));
 
     MultiValueMap<String, String> params = new HttpHeaders();
     params.add("newUsername", NEW_USER);
@@ -398,6 +398,6 @@ public void changeUsernameTooEarly() throws Exception {
 
     assertApiError(result, ErrorCode.USERNAME_CHANGE_TOO_EARLY);
 
-    assertThat(userRepository.findById(2).get().getLogin(), is(AUTH_MODERATOR));
+    assertThat(userRepository.getOne(2).getLogin(), is(AUTH_MODERATOR));
   }
 }
diff --git a/src/main/java/com/faforever/api/data/validation/VotingSubjectRevealWinnerValidator.java b/src/main/java/com/faforever/api/data/validation/VotingSubjectRevealWinnerValidator.java
@@ -10,7 +10,7 @@ public class VotingSubjectRevealWinnerValidator implements ConstraintValidator<V
 
   @Override
   public void initialize(VotingSubjectRevealWinnerCheck constraintAnnotation) {
-    //Comment for codacy to show that this constructor is intentional empty
+    // Comment for codacy to show that this constructor is intentional empty
   }
 
   @Override