Skip to content

Commit 8d904e3

Browse files
committed
faf-java-api-362 Fix after rebase
1 parent a3ffb0e commit 8d904e3

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.time.temporal.ChronoUnit;
2626
import java.util.Objects;
2727
import java.util.Set;
28-
import java.util.List;
2928

3029
@Service
3130
@RequiredArgsConstructor
@@ -61,9 +60,10 @@ public void preCreate(Clan clan) {
6160
});
6261

6362
clan.setLeader(player);
64-
clan.setMemberships(List.of(new ClanMembership()
65-
.setClan(clan)
66-
.setPlayer(player)));
63+
final ClanMembership clanMembership = new ClanMembership();
64+
clanMembership.setClan(clan);
65+
clanMembership.setPlayer(player);
66+
clan.setMemberships(Set.of(clanMembership));
6767
}
6868

6969
@SneakyThrows

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ void success() {
145145
assertThat(clan.getFounder(), is(player));
146146
assertThat(clan.getLeader(), is(player));
147147
assertThat(clan.getMemberships().size(), is(1));
148-
assertThat(clan.getMemberships().get(0).getPlayer(), is(player));
148+
assertThat(clan.getMemberships().iterator().next().getPlayer(), is(player));
149149

150150
verify(playerService).getCurrentPlayer();
151151
verify(clanRepository).findOneByName(any());

0 commit comments

Comments
 (0)