Code cleanup related to clans

Author: Brutus5000

.travis.yml

@@ -25,7 +25,7 @@ before_install:
 install:
   - git clone https://github.com/FAForever/faf-stack.git faf-stack
     && pushd faf-stack
-    && git checkout 79c5d9d
+    && git checkout 9f01fbe
     && cp -r config.template config
     && cp .env.template .env
     && ./scripts/init-db.sh

src/inttest/java/com/faforever/api/clan/ClanControllerTest.java

@@ -180,6 +180,6 @@ public void createSecondClan() throws Exception {
       .andExpect(status().isUnprocessableEntity())
       .andReturn();
 
-    assertApiError(result, ErrorCode.CLAN_CREATE_CREATOR_IS_IN_A_CLAN);
+    assertApiError(result, ErrorCode.CLAN_CREATE_FOUNDER_IS_IN_A_CLAN);
   }
 }

src/main/java/com/faforever/api/clan/ClanService.java

@@ -40,7 +40,7 @@ public class ClanService {
   @SneakyThrows
   Clan create(String name, String tag, String description, Player creator) {
     if (creator.getClanMembership() != null) {
-      throw new ApiException(new Error(ErrorCode.CLAN_CREATE_CREATOR_IS_IN_A_CLAN));
+      throw new ApiException(new Error(ErrorCode.CLAN_CREATE_FOUNDER_IS_IN_A_CLAN));
     }
     if (clanRepository.findOneByName(name).isPresent()) {
       throw new ApiException(new Error(ErrorCode.CLAN_NAME_EXISTS, name));

src/main/java/com/faforever/api/clan/ClansController.java

@@ -14,16 +14,17 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.Map;
 
-import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 
 @RestController
@@ -37,9 +38,9 @@ public class ClansController {
 
   @ApiOperation("Grab data about yourself and the clan")
   @ApiResponses(value = {
-      @ApiResponse(code = 200, message = "Success with JSON { player: {id: ?, login: ?}, clan: { id: ?, name: ?, tag: ?}}"),
-      @ApiResponse(code = 400, message = "Bad Request")})
-  @RequestMapping(path = "/me", method = RequestMethod.GET, produces = APPLICATION_JSON_UTF8_VALUE)
+    @ApiResponse(code = 200, message = "Success with JSON { player: {id: ?, login: ?}, clan: { id: ?, name: ?, tag: ?}}"),
+    @ApiResponse(code = 400, message = "Bad Request")})
+  @GetMapping(path = "/me", produces = APPLICATION_JSON_VALUE)
   public MeResult me(Authentication authentication) {
     Player player = playerService.getPlayer(authentication);
 
@@ -55,9 +56,9 @@ public MeResult me(Authentication authentication) {
   // a: the new clan with the leader membership, b: the leader membership with the new clan
   @ApiOperation("Create a clan with correct leader, founder and clan membership")
   @ApiResponses(value = {
-      @ApiResponse(code = 200, message = "Success with JSON { id: ?, type: 'clan'}"),
-      @ApiResponse(code = 400, message = "Bad Request")})
-  @RequestMapping(path = "/create", method = RequestMethod.POST, produces = APPLICATION_JSON_UTF8_VALUE)
+    @ApiResponse(code = 200, message = "Success with JSON { id: ?, type: 'clan'}"),
+    @ApiResponse(code = 400, message = "Bad Request")})
+  @PostMapping(path = "/create", produces = APPLICATION_JSON_VALUE)
   @PreAuthorize("hasRole('ROLE_USER')")
   @Transactional
   public Map<String, Serializable> createClan(@RequestParam(value = "name") String name,
@@ -71,28 +72,24 @@ public Map<String, Serializable> createClan(@RequestParam(value = "name") String
 
   @ApiOperation("Generate invitation link")
   @ApiResponses(value = {
-      @ApiResponse(code = 200, message = "Success with JSON { jwtToken: ? }"),
-      @ApiResponse(code = 400, message = "Bad Request")})
-  @RequestMapping(path = "/generateInvitationLink",
-      method = RequestMethod.GET,
-    produces = APPLICATION_JSON_UTF8_VALUE)
+    @ApiResponse(code = 200, message = "Success with JSON { jwtToken: ? }"),
+    @ApiResponse(code = 400, message = "Bad Request")})
+  @GetMapping(path = "/generateInvitationLink", produces = APPLICATION_JSON_VALUE)
   public Map<String, Serializable> generateInvitationLink(
-      @RequestParam(value = "clanId") int clanId,
-      @RequestParam(value = "playerId") int newMemberId,
-      Authentication authentication) throws IOException {
+    @RequestParam(value = "clanId") int clanId,
+    @RequestParam(value = "playerId") int newMemberId,
+    Authentication authentication) throws IOException {
     Player player = playerService.getPlayer(authentication);
     String jwtToken = clanService.generatePlayerInvitationToken(player, newMemberId, clanId);
     return ImmutableMap.of("jwtToken", jwtToken);
   }
 
   @ApiOperation("Check invitation link and add Member to Clan")
-  @RequestMapping(path = "/joinClan",
-      method = RequestMethod.POST,
-    produces = APPLICATION_JSON_UTF8_VALUE)
+  @PostMapping(path = "/joinClan", produces = APPLICATION_JSON_VALUE)
   @Transactional
   public void joinClan(
-      @RequestParam(value = "token") String stringToken,
-      Authentication authentication) throws IOException {
+    @RequestParam(value = "token") String stringToken,
+    Authentication authentication) throws IOException {
     clanService.acceptPlayerInvitationToken(stringToken, authentication);
   }
 }

src/main/java/com/faforever/api/error/ErrorCode.java

@@ -55,7 +55,7 @@ public enum ErrorCode {
   INVALID_METADATA(146, "Invalid metadata", "Metadata is not valid: {0}"),
   MAP_RENAME_FAILED(147, "Cannot rename to correct name failed ", "Cannot rename file ''{0}''"),
   MAP_INVALID_ZIP(148, "Invalid zip file", "The zip file should only contain one folder at the root level"),
-  CLAN_CREATE_CREATOR_IS_IN_A_CLAN(149, "You are already in a clan", "Clan creator is already member of a clan"),
+  CLAN_CREATE_FOUNDER_IS_IN_A_CLAN(149, "You are already in a clan", "Clan founder is already member of a clan"),
   CLAN_ACCEPT_TOKEN_EXPIRE(150, "Token Expire", "The Invitation Link expire"),
   CLAN_ACCEPT_WRONG_PLAYER(151, "Wrong Player", "Your are not the invited player"),
   CLAN_ACCEPT_PLAYER_IN_A_CLAN(152, "Player is in a clan", "You are already in a clan"),

src/test/java/com/faforever/api/clan/ClanServiceTest.java

@@ -71,7 +71,7 @@ public void createClanWhereLeaderIsAlreadyInAClan() {
       instance.create(clanName, tag, description, creator);
       fail();
     } catch (ApiException e) {
-      assertThat(e, hasErrorCode(ErrorCode.CLAN_CREATE_CREATOR_IS_IN_A_CLAN));
+      assertThat(e, hasErrorCode(ErrorCode.CLAN_CREATE_FOUNDER_IS_IN_A_CLAN));
     }
     verify(clanRepository, Mockito.never()).save(any(Clan.class));
   }

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

@@ -12,9 +12,8 @@
 public class ClanEnricherListenerTest {
   private ClanEnricherListener instance;
 
-
   @BeforeEach
-  public void setUp() throws Exception {
+  void setUp() throws Exception {
     instance = new ClanEnricherListener();
 
     FafApiProperties fafApiProperties = new FafApiProperties();
@@ -24,7 +23,7 @@ public void setUp() throws Exception {
   }
 
   @Test
-  public void enrich() throws Exception {
+  void enrich() throws Exception {
     Clan clan = ClanFactory.builder().id(54).build();
 
     instance.enrich(clan);