stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 02:44:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored tournament to use interfaces and builders

Browse Source
This commit is contained in:
Bas de Jong
2026-01-10 04:28:12 +01:00
parent aca0b2dcc0
commit 0c1b106da5
9 changed files with 230 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
framework/src/main/java/org/toop/framework/networking/server/Server.java
View File

@@ -10,8 +10,7 @@ import org.toop.framework.networking.server.stores.ClientStore;
import org.toop.framework.networking.server.stores.SubscriptionStore;
import org.toop.framework.networking.server.stores.TurnBasedGameStore;
import org.toop.framework.networking.server.stores.TurnBasedGameTypeStore;
import org.toop.framework.networking.server.tournaments.RandomShuffle;
import org.toop.framework.networking.server.tournaments.Tournament;
import org.toop.framework.networking.server.tournaments.*;
import org.toop.framework.utils.ImmutablePair;
import java.util.*;
@@ -222,7 +221,6 @@ public class Server implements GameServer<TurnBasedGame, NettyClient, Long> {
}
if (userInGame) { continue; }
//
int first = Math.max(left, right);
int second = Math.min(left, right);
@@ -267,8 +265,16 @@ public class Server implements GameServer<TurnBasedGame, NettyClient, Long> {
public void startTournament(Tournament tournament, String gameType) {
try {
tournament.init(clientStore.all().toArray(new NettyClient[0]), new RandomShuffle());
new Thread(() -> tournament.run(gameType)).start();
var tb = new TournamentBuilder();
var cTournament = tb.create(
tournament,
onlineUsers(),
this,
new BasicScoreManager(new HashMap<>()),
new BasicMatchManager(),
new RandomShuffle()
);
new Thread(() -> cTournament.run(gameType)).start();
} catch (IllegalArgumentException e) {
getUser("host").send("ERR not enough clients to start a tournament");
} catch (RuntimeException e) {

2
framework/src/main/java/org/toop/framework/networking/server/handlers/MessageHandler.java
View File

@@ -116,7 +116,7 @@ public class MessageHandler implements Handler<ParsedMessage> {
if (!client.name().equalsIgnoreCase("host")) return;
if (p.args()[0].equalsIgnoreCase("start") && p.args().length > 1) {
server.startTournament(new BasicTournament(server), p.args()[1]);
server.startTournament(new BasicTournament(), p.args()[1]);
}
}
}

85
framework/src/main/java/org/toop/framework/networking/server/tournaments/BasicMatchManager.java Normal file
View File

@@ -0,0 +1,85 @@
package org.toop.framework.networking.server.tournaments;
import org.toop.framework.gameFramework.model.game.TurnBasedGame;
import org.toop.framework.networking.server.OnlineGame;
import org.toop.framework.networking.server.Server;
import org.toop.framework.networking.server.client.NettyClient;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicReference;
public class BasicMatchManager implements MatchManager {
private final HashMap<NettyClient, List<NettyClient>> matches = new HashMap<>(); // TODO store
private final ArrayList<TournamentMatch> matchOrder = new ArrayList<>(); // TODO store
private int matchIndex = 0;
public BasicMatchManager() {}
@Override
public void addClient(NettyClient client) {
matches.putIfAbsent(client, new ArrayList<>());
}
@Override
public List<NettyClient> getClients() {
return matches.keySet().stream().toList();
}
@Override
public void createMatches() {
for (var match : matches.entrySet()) {
for (var matchNoSelf : matches.keySet()) {
if (match.getKey() == matchNoSelf) continue;
match.getValue().addLast(matchNoSelf);
}
}
for (var client : matches.entrySet()) {
for (var opponent : client.getValue()) {
matchOrder.addLast(new TournamentMatch(client.getKey(), opponent));
}
}
}
@Override
public TournamentMatch next() {
matchIndex++;
if (matchIndex >= matchOrder.size()) return null;
return matchOrder.get(matchIndex);
}
@Override
public void run(Server server, ScoreManager scoreManager, String gameType) {
new Thread(() -> {
for (var match : matchOrder) {
final CompletableFuture<Void> finished = new CompletableFuture<>();
AtomicReference<OnlineGame<TurnBasedGame>> game = new AtomicReference<>();
new Thread(() -> game.set(server.startGame(gameType, finished, match.getLeft(), match.getRight()))).start(); // TODO can possibly create a race condition
finished.join();
switch (game.get().game().getWinner()) {
case 0 -> scoreManager.addScore(match.getLeft());
case 1 -> scoreManager.addScore(match.getRight());
default -> {}
}
match.getLeft().clearGame();
match.getRight().clearGame();
}
server.endTournament(scoreManager.getScore(), gameType);
}).start();
}
@Override
public void shuffle(Shuffler shuffler) {
shuffler.shuffle(matchOrder);
}
}

30
framework/src/main/java/org/toop/framework/networking/server/tournaments/BasicScoreManager.java Normal file
View File

@@ -0,0 +1,30 @@
package org.toop.framework.networking.server.tournaments;
import org.toop.framework.networking.server.client.NettyClient;
import java.util.Map;
public class BasicScoreManager implements ScoreManager {
private final Map<NettyClient, Integer> scores;
public BasicScoreManager(Map<NettyClient, Integer> store) {
scores = store;
}
@Override
public void addClient(NettyClient client) {
scores.putIfAbsent(client, getInitScore());
}
@Override
public void addScore(NettyClient client) {
int clientScore = scores.get(client);
scores.put(client, clientScore + getWinPointAmount());
}
@Override
public Map<NettyClient, Integer> getScore() {
return scores;
}
}

124
framework/src/main/java/org/toop/framework/networking/server/tournaments/BasicTournament.java
View File

@@ -1,116 +1,48 @@
package org.toop.framework.networking.server.tournaments;
import org.toop.framework.gameFramework.model.game.TurnBasedGame;
import org.toop.framework.networking.server.OnlineGame;
import org.toop.framework.networking.server.Server;
import org.toop.framework.networking.server.client.NettyClient;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicReference;
public class BasicTournament implements Tournament {
private final int POINTS_FOR_WIN = 1;
private Server server;
private String gameType;
private ArrayList<TournamentMatch> matchList = new ArrayList<>();
private final HashMap<NettyClient, List<NettyClient>> matches = new HashMap<>();
private final HashMap<NettyClient, Integer> score = new HashMap<>();
private NettyClient[] clients;
private ScoreManager scoreManager;
private MatchManager matchManager;
public BasicTournament(Server server) {
this.server = server;
}
public BasicTournament() {}
@Override
public void init(NettyClient[] clients, Shuffler shuffler) throws IllegalArgumentException {
if (clients.length <= 1) throw new IllegalArgumentException("Not enough clients to initialize a tournament");
for (NettyClient client : clients) {
int INIT_SCORE = 0;
matches.putIfAbsent(client, new ArrayList<>());
score.putIfAbsent(client, INIT_SCORE);
}
for (var match : matches.entrySet()) {
for (var matchNoSelf : matches.keySet()) {
if (match.getKey() == matchNoSelf) continue;
match.getValue().addLast(matchNoSelf);
}
}
for (var client : matches.entrySet()) {
for (var opponent : client.getValue()) {
matchList.addLast(new TournamentMatch(client.getKey(), opponent));
}
}
try {
shuffler.shuffle(matchList);
} catch (IllegalArgumentException e) {
throw new RuntimeException(e);
}
}
public void addScorePoints(NettyClient client) {
score.put(client, score.get(client) + POINTS_FOR_WIN);
public void init(TournamentBuilder builder) {
server = builder.server;
scoreManager = builder.scoreManager;
matchManager = builder.matchManager;
}
@Override
public boolean run(String gameType) throws RuntimeException {
if (matchList.isEmpty()) throw new RuntimeException("No matches to start a tournament with");
if (server.gameTypes().stream().noneMatch(e -> e.equalsIgnoreCase(gameType))) return false;
this.gameType = gameType;
new Thread(() -> {
for (var match : matchList) {
final CompletableFuture<Void> finished = new CompletableFuture<>();
AtomicReference<OnlineGame<TurnBasedGame>> game = new AtomicReference<>();
new Thread(() -> game.set(server.startGame(gameType, finished, match.getLeft(), match.getRight()))).start(); // TODO can possibly create a race condition
finished.join();
switch (game.get().game().getWinner()) {
case 0 -> addScorePoints(match.getLeft());
case 1 -> addScorePoints(match.getRight());
default -> {}
}
match.getLeft().clearGame();
match.getRight().clearGame();
}
server.endTournament(end(), gameType);
}).start();
matchManager.run(server, scoreManager, gameType);
return true;
}
@Override
public HashMap<NettyClient, Integer> end() {
for (var match : matchList) {
match.getLeft().clearGame(); // TODO send msg to client
match.getRight().clearGame(); // TODO send msg to client
}
gameType = null;
matchList = null;
matches.clear();
HashMap<NettyClient, Integer> retScore = new HashMap<>(score);
score.clear();
clients = null;
return retScore;
}
// @Override
// public HashMap<NettyClient, Integer> end() {
//
// for (var match : matchList) {
// match.getLeft().clearGame(); // TODO send msg to client
// match.getRight().clearGame(); // TODO send msg to client
// }
//
// gameType = null;
// matchList = null;
// matches.clear();
//
// HashMap<NettyClient, Integer> retScore = new HashMap<>(score);
//
// score.clear();
//
// clients = null;
//
// return retScore;
// }
}

15
framework/src/main/java/org/toop/framework/networking/server/tournaments/MatchManager.java Normal file
View File

@@ -0,0 +1,15 @@
package org.toop.framework.networking.server.tournaments;
import org.toop.framework.networking.server.Server;
import org.toop.framework.networking.server.client.NettyClient;
import java.util.List;
public interface MatchManager {
void addClient(NettyClient client);
List<NettyClient> getClients();
void createMatches();
TournamentMatch next();
void run(Server server, ScoreManager scoreManager, String gameType);
void shuffle(Shuffler shuffler);
}

19
framework/src/main/java/org/toop/framework/networking/server/tournaments/ScoreManager.java Normal file
View File

@@ -0,0 +1,19 @@
package org.toop.framework.networking.server.tournaments;
import org.toop.framework.networking.server.client.NettyClient;
import java.util.Map;
public interface ScoreManager {
void addClient(NettyClient client);
void addScore(NettyClient client);
Map<NettyClient, Integer> getScore();
default int getWinPointAmount() {
return 1;
}
default int getInitScore() {
return 0;
}
}

4
framework/src/main/java/org/toop/framework/networking/server/tournaments/Tournament.java
View File

@@ -5,7 +5,7 @@ import org.toop.framework.networking.server.client.NettyClient;
import java.util.HashMap;
public interface Tournament {
void init(NettyClient[] clients, Shuffler shuffler);
void init(TournamentBuilder builder);
boolean run(String gameType);
HashMap<NettyClient, Integer> end();
// HashMap<NettyClient, Integer> end();
}

39
framework/src/main/java/org/toop/framework/networking/server/tournaments/TournamentBuilder.java Normal file
View File

@@ -0,0 +1,39 @@
package org.toop.framework.networking.server.tournaments;
import org.toop.framework.networking.server.Server;
import org.toop.framework.networking.server.client.NettyClient;
import java.util.List;
public class TournamentBuilder {
public Server server;
public ScoreManager scoreManager;
public MatchManager matchManager;
public TournamentBuilder() {}
public Tournament create(
Tournament tournament,
List<NettyClient> clients,
Server server,
ScoreManager scoreManager,
MatchManager matchManager,
Shuffler shuffler
) {
this.server = server;
this.scoreManager = scoreManager;
this.matchManager = matchManager;
for (var client : clients) {
matchManager.addClient(client);
scoreManager.addClient(client);
}
matchManager.createMatches();
matchManager.shuffle(shuffler);
tournament.init(this);
return tournament;
}
}