Fix: Resolving Git Merge Conflicts #253

Merged
j.kropff merged 69 commits from chore/ui-checkstyle-fixes into main 2026-04-11 15:10:58 +02:00
4 changed files with 15 additions and 4 deletions
Showing only changes of commit cdb6d0c6b0 - Show all commits
@@ -1,12 +1,15 @@
package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick; package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick;
import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User; import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User;
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.command.execution.CommandHandler; import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatcher.ResponseDispatcher; import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatcher.ResponseDispatcher;
import java.util.Optional; import java.util.Optional;
/** Handles {@link CheckUsernameRequest}s to check whether a username is available. */ /** Handles {@link CheckUsernameRequest}s to check whether a username is available. */
public class CheckUsernameHandler extends CommandHandler<CheckUsernameRequest> { public class CheckUsernameHandler extends CommandHandler<CheckUsernameRequest> {
private final UserRegistry userRegistry; private final UserRegistry userRegistry;
/** /**
* Creates a new handler for checking username availability. * Creates a new handler for checking username availability.
* *
@@ -17,6 +20,7 @@ public class CheckUsernameHandler extends CommandHandler<CheckUsernameRequest> {
super(responseDispatcher); super(responseDispatcher);
this.userRegistry = userRegistry; this.userRegistry = userRegistry;
} }
/** /**
* Executes the username availability check for the given request. * Executes the username availability check for the given request.
* *
@@ -36,4 +40,4 @@ public class CheckUsernameHandler extends CommandHandler<CheckUsernameRequest> {
} }
responseDispatcher.dispatch(new CheckUsernameResponse(request.getContext(), availability)); responseDispatcher.dispatch(new CheckUsernameResponse(request.getContext(), availability));
} }
} }
@@ -1,7 +1,9 @@
package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick; package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick;
import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParser; import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParser;
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest; import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest;
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.accessor.RequestParameterAccessor; import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.accessor.RequestParameterAccessor;
/** Parses a primitive request into a {@link CheckUsernameRequest}. */ /** Parses a primitive request into a {@link CheckUsernameRequest}. */
public class CheckUsernameParser implements CommandParser<CheckUsernameRequest> { public class CheckUsernameParser implements CommandParser<CheckUsernameRequest> {
/** /**
@@ -16,4 +18,4 @@ public class CheckUsernameParser implements CommandParser<CheckUsernameRequest>
new RequestParameterAccessor(primitiveRequest.parameters()); new RequestParameterAccessor(primitiveRequest.parameters());
return new CheckUsernameRequest(primitiveRequest.context(), accessor.require("USERNAME")); return new CheckUsernameRequest(primitiveRequest.context(), accessor.require("USERNAME"));
} }
} }
@@ -1,9 +1,12 @@
package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick; package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick;
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request; import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext; import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
/** Request implementation used to check whether a username is available or already taken */ /** Request implementation used to check whether a username is available or already taken */
public class CheckUsernameRequest extends Request { public class CheckUsernameRequest extends Request {
private final String username; private final String username;
/** /**
* Constructs a new CheckUsernameRequest with the given context and username to check * Constructs a new CheckUsernameRequest with the given context and username to check
* *
@@ -15,6 +18,7 @@ public class CheckUsernameRequest extends Request {
super(context); super(context);
this.username = username; this.username = username;
} }
/** /**
* Returns the provided username in the request * Returns the provided username in the request
* *
@@ -23,4 +27,4 @@ public class CheckUsernameRequest extends Request {
public String getUsername() { public String getUsername() {
return username; return username;
} }
} }
@@ -3,6 +3,7 @@ package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick;
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext; import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.SuccessResponse; import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.SuccessResponse;
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBodyBuilder; import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBodyBuilder;
/** Response indicating the availability status of a username check. */ /** Response indicating the availability status of a username check. */
public class CheckUsernameResponse extends SuccessResponse { public class CheckUsernameResponse extends SuccessResponse {
/** /**
@@ -14,4 +15,4 @@ public class CheckUsernameResponse extends SuccessResponse {
public CheckUsernameResponse(RequestContext context, UsernameAvailability availability) { public CheckUsernameResponse(RequestContext context, UsernameAvailability availability) {
super(context, new ResponseBodyBuilder().param("STATUS", availability).build()); super(context, new ResponseBodyBuilder().param("STATUS", availability).build());
} }
} }