University-of-Basel-Studentprojects/Programmierprojekt
Archived
1
0
Fork 0
Code Issues 17 Pull Requests Actions Wiki Activity

Feat: accept optional client username and forward to ClientApp

Browse Source 
Pass host/port and optional username via system properties for the UI.

Refs #68
This commit is contained in:
Jona Walpert
2026-04-10 14:12:24 +02:00
parent 3ee1e63577
commit 3807059229
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ch/unibas/dmi/dbis/cs108/casono/Main.java
+9 -5
View File
@@ -17,10 +17,13 @@ public final class Main {
printUsage(); printUsage();
System.exit(1); System.exit(1);
} }
switch (args[0]) { switch (args[0]) {
case "server" -> ServerApp.start(args[1]); case "server" -> ServerApp.start(args[1]);
case "client" -> ClientApp.start(args[1]); case "client" -> {
String address = args[1];
String username = args.length >= 3 ? args[2] : null;
ClientApp.start(address, username);
}
default -> { default -> {
printUsage(); printUsage();
System.exit(1); System.exit(1);
@@ -29,12 +32,13 @@ public final class Main {
} }
private static boolean isValid(String[] args) { private static boolean isValid(String[] args) {
if (args.length != 2) { if (args.length < 2) {
return false; return false;
} }
return switch (args[0]) { return switch (args[0]) {
case "server", "client" -> true; case "server" -> args.length == 2;
case "client" -> args.length == 2 || args.length == 3;
default -> false; default -> false;
}; };
} }
@@ -45,7 +49,7 @@ public final class Main {
""" """
Usage: Usage:
java -jar xyz.jar server <listenPort> java -jar xyz.jar server <listenPort>
java -jar xyz.jar client <serverIp>:<serverPort> java -jar xyz.jar client <serverIp>:<serverPort> [<username>]
"""); """);
} }
} }
src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ClientApp.java
+7 -1
View File
@@ -27,7 +27,7 @@ public class ClientApp {
* @param arg Address in the format "ip:port". * @param arg Address in the format "ip:port".
* @throws IllegalArgumentException if the address format is invalid. * @throws IllegalArgumentException if the address format is invalid.
*/ */
public static void start(String arg) { public static void start(String arg, String username) {
String[] parts = arg.split(":", 2); String[] parts = arg.split(":", 2);
if (parts.length != 2) { if (parts.length != 2) {
throw new IllegalArgumentException("Address must be in format <ip>:<port>."); throw new IllegalArgumentException("Address must be in format <ip>:<port>.");
@@ -36,6 +36,12 @@ public class ClientApp {
int port = Integer.parseInt(parts[1]); int port = Integer.parseInt(parts[1]);
LOGGER.info("You've selected the client. It will connect port {} at host {}", port, host); LOGGER.info("You've selected the client. It will connect port {} at host {}", port, host);
// Pass connection defaults and optional username to the UI via system properties
System.setProperty("casono.server.host", host);
System.setProperty("casono.server.port", String.valueOf(port));
if (username != null && !username.isBlank()) {
System.setProperty("casono.username", username);
}
Launcher.main(new String[] {}); Launcher.main(new String[] {});
} }
} }