From 49019075e4479014adfb5b69d3efef59d1c2c9b7 Mon Sep 17 00:00:00 2001 From: Lars Simon Winzer Date: Fri, 13 Mar 2026 14:42:19 +0100 Subject: [PATCH] Move: Network related files into respective folders --- .../dbis/cs108/casono/server/network/DisconnectEvent.java | 3 --- .../unibas/dmi/dbis/cs108/casono/server/network/Event.java | 3 --- .../dbis/cs108/casono/server/network/NetworkManager.java | 6 ++++++ .../cs108/casono/server/network/events/DisconnectEvent.java | 5 +++++ .../dmi/dbis/cs108/casono/server/network/events/Event.java | 3 +++ .../cs108/casono/server/network/{ => events}/EventBus.java | 2 +- .../cs108/casono/server/network/{ => sessions}/Session.java | 6 +++++- .../casono/server/network/{ => sessions}/SessionId.java | 2 +- .../server/network/{ => sessions}/SessionManager.java | 2 +- .../casono/server/network/{ => transport}/TcpTransport.java | 2 +- .../server/network/{ => transport}/TransportLayer.java | 2 +- 11 files changed, 24 insertions(+), 12 deletions(-) delete mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/DisconnectEvent.java delete mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/Event.java create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/DisconnectEvent.java create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/Event.java rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{ => events}/EventBus.java (93%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{ => sessions}/Session.java (83%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{ => sessions}/SessionId.java (85%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{ => sessions}/SessionManager.java (92%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{ => transport}/TcpTransport.java (94%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{ => transport}/TransportLayer.java (74%) diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/DisconnectEvent.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/DisconnectEvent.java deleted file mode 100644 index ea23e18..0000000 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/DisconnectEvent.java +++ /dev/null @@ -1,3 +0,0 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network; - -public record DisconnectEvent(SessionId sessionId) implements Event {} diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/Event.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/Event.java deleted file mode 100644 index 0c89aa1..0000000 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/Event.java +++ /dev/null @@ -1,3 +0,0 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network; - -interface Event {} diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/NetworkManager.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/NetworkManager.java index 3e60e59..880bd56 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/NetworkManager.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/NetworkManager.java @@ -7,6 +7,12 @@ import java.net.Socket; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import ch.unibas.dmi.dbis.cs108.casono.server.network.events.DisconnectEvent; +import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus; +import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.Session; +import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionManager; +import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TcpTransport; + /** * Creates and manages the server socket. Accepts new incomming connections and creates sessions. */ diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/DisconnectEvent.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/DisconnectEvent.java new file mode 100644 index 0000000..65f8152 --- /dev/null +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/DisconnectEvent.java @@ -0,0 +1,5 @@ +package ch.unibas.dmi.dbis.cs108.casono.server.network.events; + +import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId; + +public record DisconnectEvent(SessionId sessionId) implements Event {} diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/Event.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/Event.java new file mode 100644 index 0000000..4fb6948 --- /dev/null +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/Event.java @@ -0,0 +1,3 @@ +package ch.unibas.dmi.dbis.cs108.casono.server.network.events; + +interface Event {} diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/EventBus.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/EventBus.java similarity index 93% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/EventBus.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/EventBus.java index 5b9d6c6..6644313 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/EventBus.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/EventBus.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network; +package ch.unibas.dmi.dbis.cs108.casono.server.network.events; import java.util.List; import java.util.Map; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/Session.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/Session.java similarity index 83% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/Session.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/Session.java index 1ae946c..e2ece59 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/Session.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/Session.java @@ -1,10 +1,14 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network; +package ch.unibas.dmi.dbis.cs108.casono.server.network.sessions; import java.io.EOFException; import java.io.IOException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import ch.unibas.dmi.dbis.cs108.casono.server.network.events.DisconnectEvent; +import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus; +import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer; + public class Session implements Runnable { private SessionId id; private Thread thread; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/SessionId.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionId.java similarity index 85% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/SessionId.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionId.java index 0af06ad..117dba3 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/SessionId.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionId.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network; +package ch.unibas.dmi.dbis.cs108.casono.server.network.sessions; import java.util.UUID; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/SessionManager.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java similarity index 92% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/SessionManager.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java index 69fcdbe..f583be1 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/SessionManager.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network; +package ch.unibas.dmi.dbis.cs108.casono.server.network.sessions; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/TcpTransport.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/transport/TcpTransport.java similarity index 94% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/TcpTransport.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/transport/TcpTransport.java index 4cb9910..6a761e6 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/TcpTransport.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/transport/TcpTransport.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network; +package ch.unibas.dmi.dbis.cs108.casono.server.network.transport; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/TransportLayer.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/transport/TransportLayer.java similarity index 74% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/TransportLayer.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/transport/TransportLayer.java index 30aac09..a4453e4 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/TransportLayer.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/transport/TransportLayer.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network; +package ch.unibas.dmi.dbis.cs108.casono.server.network.transport; import java.io.IOException;