Style: Spotless apllied to JoinLobby command
This commit is contained in:
@@ -24,6 +24,7 @@ import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.ping.PingRequest;
|
|||||||
import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message.SendMessageHandler;
|
import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message.SendMessageHandler;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message.SendMessageParser;
|
import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message.SendMessageParser;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message.SendMessageRequest;
|
import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message.SendMessageRequest;
|
||||||
|
import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyManager;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserCleanupJob;
|
import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserCleanupJob;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
|
import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.network.NetworkManager;
|
import ch.unibas.dmi.dbis.cs108.casono.server.network.NetworkManager;
|
||||||
@@ -85,7 +86,8 @@ public class ServerApp {
|
|||||||
SESSION_DISCONNECT_JOB_PERIOD,
|
SESSION_DISCONNECT_JOB_PERIOD,
|
||||||
TimeUnit.SECONDS);
|
TimeUnit.SECONDS);
|
||||||
|
|
||||||
registerCommands(dispatcher, router, responseDispatcher, userRegistry);
|
LobbyManager lobbyManager = new LobbyManager();
|
||||||
|
registerCommands(dispatcher, router, responseDispatcher, userRegistry, lobbyManager);
|
||||||
|
|
||||||
NetworkManager networkManager = new NetworkManager(port, sessionManager, router);
|
NetworkManager networkManager = new NetworkManager(port, sessionManager, router);
|
||||||
networkManager.start();
|
networkManager.start();
|
||||||
@@ -94,15 +96,19 @@ public class ServerApp {
|
|||||||
/**
|
/**
|
||||||
* Registers command parsers and handlers.
|
* Registers command parsers and handlers.
|
||||||
*
|
*
|
||||||
* @param parserDispatcher the dispatcher responsible for parsing incoming commands
|
* @param parserDispatcher the dispatcher responsible for parsing incoming
|
||||||
* @param commandRouter the router that dispatches parsed commands to appropriate handlers
|
* commands
|
||||||
* @param responseDispatcher the dispatcher responsible for sending responses back to clients
|
* @param commandRouter the router that dispatches parsed commands to
|
||||||
|
* appropriate handlers
|
||||||
|
* @param responseDispatcher the dispatcher responsible for sending responses
|
||||||
|
* back to clients
|
||||||
*/
|
*/
|
||||||
private static void registerCommands(
|
private static void registerCommands(
|
||||||
CommandParserDispatcher parserDispatcher,
|
CommandParserDispatcher parserDispatcher,
|
||||||
CommandRouter commandRouter,
|
CommandRouter commandRouter,
|
||||||
ResponseDispatcher responseDispatcher,
|
ResponseDispatcher responseDispatcher,
|
||||||
UserRegistry userRegistry) {
|
UserRegistry userRegistry,
|
||||||
|
LobbyManager lobbyManager) {
|
||||||
parserDispatcher.register("PING", new PingParser());
|
parserDispatcher.register("PING", new PingParser());
|
||||||
commandRouter.register(PingRequest.class, new PingHandler(responseDispatcher));
|
commandRouter.register(PingRequest.class, new PingHandler(responseDispatcher));
|
||||||
|
|
||||||
@@ -136,5 +142,24 @@ public class ServerApp {
|
|||||||
parserDispatcher.register("LIST_USERS", new ListUsersParser());
|
parserDispatcher.register("LIST_USERS", new ListUsersParser());
|
||||||
commandRouter.register(
|
commandRouter.register(
|
||||||
ListUsersRequest.class, new ListUsersHandler(responseDispatcher, userRegistry));
|
ListUsersRequest.class, new ListUsersHandler(responseDispatcher, userRegistry));
|
||||||
|
|
||||||
|
// Lobby commands
|
||||||
|
parserDispatcher.register(
|
||||||
|
"JOIN_LOBBY",
|
||||||
|
new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.join_lobby.JoinLobbyParser());
|
||||||
|
commandRouter.register(
|
||||||
|
ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.join_lobby.JoinLobbyRequest.class,
|
||||||
|
new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.join_lobby.JoinLobbyHandler(
|
||||||
|
responseDispatcher, lobbyManager, userRegistry));
|
||||||
|
|
||||||
|
|
||||||
|
// Game state: allow client to request game snapshot for their lobby
|
||||||
|
parserDispatcher.register(
|
||||||
|
"GET_GAME_STATE",
|
||||||
|
new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.get_game_state.GetGameStateParser());
|
||||||
|
commandRouter.register(
|
||||||
|
ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.get_game_state.GetGameStateRequest.class,
|
||||||
|
new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.get_game_state.GetGameStateHandler(
|
||||||
|
responseDispatcher, lobbyManager, userRegistry));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-8
@@ -13,12 +13,10 @@ import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatch
|
|||||||
/**
|
/**
|
||||||
* Handler for the `JOIN_LOBBY` command.
|
* Handler for the `JOIN_LOBBY` command.
|
||||||
*
|
*
|
||||||
* <p>
|
* <p>Resolves the username from the session (requires {@link UserLoggedInCheck}), looks up the
|
||||||
* Resolves the username from the session (requires {@link UserLoggedInCheck}),
|
* target lobby and attempts to add the user. On success an `+OK` response is dispatched; on failure
|
||||||
* looks up the target lobby and attempts to add the user. On success an
|
* an appropriate {@link ErrorResponse} with one of the error codes `LOBBY_NOT_FOUND`,
|
||||||
* `+OK` response is dispatched; on failure an appropriate {@link ErrorResponse}
|
* `USER_NOT_LOGGED_IN` or `LOBBY_FULL_OR_ALREADY_IN` is returned.
|
||||||
* with one of the error codes `LOBBY_NOT_FOUND`, `USER_NOT_LOGGED_IN` or
|
|
||||||
* `LOBBY_FULL_OR_ALREADY_IN` is returned.
|
|
||||||
*/
|
*/
|
||||||
public class JoinLobbyHandler extends CommandHandler<JoinLobbyRequest> {
|
public class JoinLobbyHandler extends CommandHandler<JoinLobbyRequest> {
|
||||||
private final LobbyManager lobbyManager;
|
private final LobbyManager lobbyManager;
|
||||||
@@ -27,8 +25,7 @@ public class JoinLobbyHandler extends CommandHandler<JoinLobbyRequest> {
|
|||||||
/**
|
/**
|
||||||
* Create a new {@link JoinLobbyHandler}.
|
* Create a new {@link JoinLobbyHandler}.
|
||||||
*
|
*
|
||||||
* @param responseDispatcher dispatcher used to send responses back to the
|
* @param responseDispatcher dispatcher used to send responses back to the client
|
||||||
* client
|
|
||||||
* @param lobbyManager manager providing lobby state and operations
|
* @param lobbyManager manager providing lobby state and operations
|
||||||
* @param userRegistry registry to resolve session -> user mappings
|
* @param userRegistry registry to resolve session -> user mappings
|
||||||
*/
|
*/
|
||||||
|
|||||||
+6
-6
@@ -7,15 +7,14 @@ import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.accessor.
|
|||||||
/**
|
/**
|
||||||
* Parser for the `JOIN_LOBBY` command.
|
* Parser for the `JOIN_LOBBY` command.
|
||||||
*
|
*
|
||||||
* <p>
|
* <p>Expected request parameters:
|
||||||
* Expected request parameters:
|
*
|
||||||
* <ul>
|
* <ul>
|
||||||
* <li>`ID` (int) — numeric lobby identifier (required)
|
* <li>`ID` (int) — numeric lobby identifier (required)
|
||||||
* </ul>
|
* </ul>
|
||||||
*
|
*
|
||||||
* <p>
|
* <p>The parser builds a {@link JoinLobbyRequest} containing the parsed lobby id and the original
|
||||||
* The parser builds a {@link JoinLobbyRequest} containing the parsed lobby id
|
* request context.
|
||||||
* and the original request context.
|
|
||||||
*/
|
*/
|
||||||
public class JoinLobbyParser implements CommandParser<JoinLobbyRequest> {
|
public class JoinLobbyParser implements CommandParser<JoinLobbyRequest> {
|
||||||
/**
|
/**
|
||||||
@@ -26,7 +25,8 @@ public class JoinLobbyParser implements CommandParser<JoinLobbyRequest> {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public JoinLobbyRequest parse(PrimitiveRequest primitiveRequest) {
|
public JoinLobbyRequest parse(PrimitiveRequest primitiveRequest) {
|
||||||
RequestParameterAccessor accessor = new RequestParameterAccessor(primitiveRequest.parameters());
|
RequestParameterAccessor accessor =
|
||||||
|
new RequestParameterAccessor(primitiveRequest.parameters());
|
||||||
int id = accessor.require("ID", Integer::parseInt);
|
int id = accessor.require("ID", Integer::parseInt);
|
||||||
return new JoinLobbyRequest(primitiveRequest.context(), id);
|
return new JoinLobbyRequest(primitiveRequest.context(), id);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-3
@@ -6,9 +6,8 @@ import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestCo
|
|||||||
/**
|
/**
|
||||||
* Request data for the `JOIN_LOBBY` command.
|
* Request data for the `JOIN_LOBBY` command.
|
||||||
*
|
*
|
||||||
* <p>
|
* <p>Contains the lobby id the client wants to join and inherits the {@link Request} contextual
|
||||||
* Contains the lobby id the client wants to join and inherits the
|
* information.
|
||||||
* {@link Request} contextual information.
|
|
||||||
*/
|
*/
|
||||||
public class JoinLobbyRequest extends Request {
|
public class JoinLobbyRequest extends Request {
|
||||||
private final int id;
|
private final int id;
|
||||||
|
|||||||
Reference in New Issue
Block a user