diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationPairing.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationPairing.java index 8a53fd594..7a9e4c38e 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationPairing.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationPairing.java @@ -16,7 +16,9 @@ public class SingleEliminationPairing implements PairingMechanism { } @Override - public boolean pairPlayers(int round, Set players, Set droppedPlayers, Map playerByes, List currentStandings, Map pairingResults, Set byeResults) { + public boolean pairPlayers(int round, Set players, Set droppedPlayers, Map playerByes, List currentStandings, + Map> previouslyPaired, + Map pairingResults, Set byeResults) { if (isFinished(round, players, droppedPlayers)) return true; diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/tournament/DefaultTournamentTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/tournament/DefaultTournamentTest.java index 2462b9446..42a10fd7f 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/tournament/DefaultTournamentTest.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/tournament/DefaultTournamentTest.java @@ -52,6 +52,7 @@ public class DefaultTournamentTest { Mockito.when(pairingMechanism.pairPlayers(Mockito.eq(1), Mockito.eq(allPlayers), Mockito.eq(Collections.emptySet()), Mockito.eq(Collections.emptyMap()), Mockito.>any(), + Mockito.any(Map.class), Mockito.eq(Collections.emptyMap()), Mockito.eq(Collections.emptySet()))).then( new Answer() { @Override @@ -67,6 +68,7 @@ public class DefaultTournamentTest { }); Mockito.when(pairingMechanism.pairPlayers(Mockito.eq(2), Mockito.eq(allPlayers), Mockito.eq(droppedAfterRoundOne), Mockito.eq(Collections.emptyMap()), Mockito.>any(), + Mockito.any(Map.class), Mockito.eq(Collections.emptyMap()), Mockito.eq(Collections.emptySet()))).then( new Answer() { @Override @@ -80,6 +82,7 @@ public class DefaultTournamentTest { }); Mockito.when(pairingMechanism.pairPlayers(Mockito.eq(3), Mockito.eq(allPlayers), Mockito.eq(droppedAfterRoundTwo), Mockito.eq(Collections.emptyMap()), Mockito.>any(), + Mockito.any(Map.class), Mockito.eq(Collections.emptyMap()), Mockito.eq(Collections.emptySet()))).then( new Answer() { @Override diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/tournament/SingleEliminationPairingTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/tournament/SingleEliminationPairingTest.java index f1d8d9cb4..331ac7fe0 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/tournament/SingleEliminationPairingTest.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/tournament/SingleEliminationPairingTest.java @@ -34,7 +34,7 @@ public class SingleEliminationPairingTest { Map pairingResults = new HashMap(); Set byeResults = new HashSet(); - assertFalse(_pairing.pairPlayers(1, allPlayers, Collections.emptySet(), Collections.emptyMap(), null, pairingResults, byeResults)); + assertFalse(_pairing.pairPlayers(1, allPlayers, Collections.emptySet(), Collections.emptyMap(), null, null, pairingResults, byeResults)); assertEquals(0, byeResults.size()); assertEquals(2, pairingResults.size()); @@ -55,7 +55,7 @@ public class SingleEliminationPairingTest { Map pairingResults = new HashMap(); Set byeResults = new HashSet(); - assertFalse(_pairing.pairPlayers(1, allPlayers, Collections.emptySet(), Collections.emptyMap(), null, pairingResults, byeResults)); + assertFalse(_pairing.pairPlayers(1, allPlayers, Collections.emptySet(), Collections.emptyMap(), null, null, pairingResults, byeResults)); assertEquals(1, byeResults.size()); assertEquals(1, pairingResults.size()); @@ -82,7 +82,7 @@ public class SingleEliminationPairingTest { playerByes.put("p2", 2); playerByes.put("p3", 3); - assertFalse(_pairing.pairPlayers(1, allPlayers, Collections.emptySet(), playerByes, null, pairingResults, byeResults)); + assertFalse(_pairing.pairPlayers(1, allPlayers, Collections.emptySet(), playerByes, null, null, pairingResults, byeResults)); assertEquals(1, byeResults.size()); assertTrue(byeResults.contains("p1")); @@ -107,7 +107,7 @@ public class SingleEliminationPairingTest { Map pairingResults = new HashMap(); Set byeResults = new HashSet(); - assertFalse(_pairing.pairPlayers(1, allPlayers, droppedPlayers, Collections.emptyMap(), null, pairingResults, byeResults)); + assertFalse(_pairing.pairPlayers(1, allPlayers, droppedPlayers, Collections.emptyMap(), null, null, pairingResults, byeResults)); assertEquals(1, byeResults.size()); assertEquals(1, pairingResults.size()); diff --git a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AbstractResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AbstractResource.java index 2007cd32e..b0073b486 100644 --- a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AbstractResource.java +++ b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AbstractResource.java @@ -70,7 +70,7 @@ public abstract class AbstractResource { if (resourceOwner == null) throw new WebApplicationException(Response.Status.UNAUTHORIZED); - if (resourceOwner.getType().contains("a") && participantId != null && !participantId.equals("null")) { + if (resourceOwner.getType().contains("a") && participantId != null && !participantId.equals("null") && !participantId.equals("")) { resourceOwner = _playerDao.getPlayer(participantId); if (resourceOwner == null) throw new WebApplicationException(Response.Status.UNAUTHORIZED);