faf-java-api-362 Fix after rebase

FAForever · Dec 6, 2020 · 2dff99a · 2dff99a
1 parent 221bcb8
commit 2dff99a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/com/faforever/api/clan/ClanService.java b/src/main/java/com/faforever/api/clan/ClanService.java
@@ -22,7 +22,7 @@
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
-import java.util.List;
+import java.util.Set;
 
 @Service
 @RequiredArgsConstructor
@@ -58,9 +58,10 @@ public void preCreate(Clan clan) {
     });
 
     clan.setLeader(player);
-    clan.setMemberships(List.of(new ClanMembership()
-      .setClan(clan)
-      .setPlayer(player)));
+    final ClanMembership clanMembership = new ClanMembership();
+    clanMembership.setClan(clan);
+    clanMembership.setPlayer(player);
+    clan.setMemberships(Set.of(clanMembership));
   }
 
   @SneakyThrows

diff --git a/src/test/java/com/faforever/api/clan/ClanServiceTest.java b/src/test/java/com/faforever/api/clan/ClanServiceTest.java
@@ -143,7 +143,7 @@ void success() {
       assertThat(clan.getFounder(), is(player));
       assertThat(clan.getLeader(), is(player));
       assertThat(clan.getMemberships().size(), is(1));
-      assertThat(clan.getMemberships().get(0).getPlayer(), is(player));
+      assertThat(clan.getMemberships().iterator().next().getPlayer(), is(player));
 
       verify(playerService).getCurrentPlayer();
       verify(clanRepository).findOneByName(any());