src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/transport/RawPacket.java

@@ -0,0 +1,7 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.network.transport;
+
+/**
+ * Transport object, created by the transport layer to store raw data about the request
+ * prior to any processing
+ */
+public record RawPacket(int requestId, String payload) {}

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/transport/TcpTransport.java

@@ -27,24 +27,30 @@ public class TcpTransport implements TransportLayer {
     /**
      * Reads a string from the socket.
      *
-     * @return the read string
+     * @return the read RawPacket
      * @throws IOException if an I/O error occurs
      */
-    public String read() throws IOException {
+    public RawPacket read() throws IOException {
         int length = in.readInt();
-        byte[] payload = new byte[length];
-        in.readFully(payload);
-        return new String(payload, StandardCharsets.UTF_8);
+        int requestId = in.readInt();
+        byte[] rawPayload = new byte[length];
+        in.readFully(rawPayload);
+
+        String payload = new String(rawPayload, StandardCharsets.UTF_8);
+        return new RawPacket(requestId, payload);
     }
 
     /**
      * Writes a string to the socket.
      *
-     * @param payload the string to write
+     * @param data the RawPacket's data to write
      * @throws IOException if an I/O error occurs
      */
-    public void write(String payload) throws IOException {
-        byte[] rawPayload = payload.getBytes(StandardCharsets.UTF_8);
+    public void write(RawPacket data) throws IOException {
+        int requestId = data.requestId();
+        byte[] rawPayload = data.payload().getBytes(StandardCharsets.UTF_8);
+
+        out.writeInt(requestId);
         out.writeInt(rawPayload.length);
         out.write(rawPayload);
         out.flush();

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/transport/TransportLayer.java

@@ -7,10 +7,10 @@ public interface TransportLayer {
     /**
      * Reads data from the transport layer.
      *
-     * @return the read data as a string
+     * @return the read data as a RawPacket
      * @throws IOException if an I/O error occurs
      */
-    String read() throws IOException;
+    RawPacket read() throws IOException;
 
     /**
      * Writes data to the transport layer.
@@ -18,7 +18,7 @@ public interface TransportLayer {
      * @param data the data to write
      * @throws IOException if an I/O error occurs
      */
-    void write(String data) throws IOException;
+    void write(RawPacket data) throws IOException;
 
     /**
      * Closes the transport layer.