From 3fe467a2a3d1dff7a2d5e3dd8848dd2f4e549bbc Mon Sep 17 00:00:00 2001 From: Gaa56 Date: Wed, 22 Oct 2025 19:19:28 +0100 Subject: [PATCH 01/11] Create MessageProtocol interface --- .../java/sd/protocol/MessageProtocol.java | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 main/src/main/java/sd/protocol/MessageProtocol.java diff --git a/main/src/main/java/sd/protocol/MessageProtocol.java b/main/src/main/java/sd/protocol/MessageProtocol.java new file mode 100644 index 0000000..9f20437 --- /dev/null +++ b/main/src/main/java/sd/protocol/MessageProtocol.java @@ -0,0 +1,44 @@ +package sd.protocol; + + + +import java.io.Serializable; + +import sd.model.MessageType; + +/** + * Interface que define o contrato para todas as mensagens trocadas no simulador. + * Garante que qualquer mensagem possa ser identificada e roteada. + * * Esta interface estende Serializable para permitir que os objetos que a implementam + * sejam enviados através de Sockets (ObjectOutputStream). + * + */ +public interface MessageProtocol extends Serializable { + + /** + * Retorna o tipo da mensagem, indicando o seu propósito. + * @return O MessageType (ex: VEHICLE_TRANSFER, STATS_UPDATE). + */ + MessageType getType(); + + /** + * Retorna o objeto de dados (carga útil) que esta mensagem transporta. + * O tipo de objeto dependerá do MessageType. + * * - Se getType() == VEHICLE_TRANSFER, o payload será um objeto {@link sd.model.Vehicle}. + * - Se getType() == STATS_UPDATE, o payload será um objeto de estatísticas. + * * @return O objeto de dados (payload), que também deve ser Serializable. + */ + Object getPayload(); + + /** + * Retorna o ID do nó (Processo) que enviou esta mensagem. + * @return String (ex: "Cr1", "Cr5", "S"). + */ + String getSourceNode(); + + /** + * Retorna o ID do nó (Processo) de destino desta mensagem. + * @return String (ex: "Cr2", "DashboardServer"). + */ + String getDestinationNode(); +} From 6c5eab0e72fe5d13e18034e017e25b58f6617ec4 Mon Sep 17 00:00:00 2001 From: Gaa56 Date: Sat, 25 Oct 2025 17:41:55 +0100 Subject: [PATCH 02/11] Create SocketConnection wrapper class --- .../java/sd/protocol/MessageProtocol.java | 37 +++++++++---------- .../java/sd/protocol/SocketConnection.java | 5 +++ 2 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 main/src/main/java/sd/protocol/SocketConnection.java diff --git a/main/src/main/java/sd/protocol/MessageProtocol.java b/main/src/main/java/sd/protocol/MessageProtocol.java index 9f20437..47975be 100644 --- a/main/src/main/java/sd/protocol/MessageProtocol.java +++ b/main/src/main/java/sd/protocol/MessageProtocol.java @@ -1,44 +1,41 @@ package sd.protocol; - - import java.io.Serializable; - -import sd.model.MessageType; +import sd.model.MessageType; // Assuming MessageType is in sd.model or sd.protocol /** - * Interface que define o contrato para todas as mensagens trocadas no simulador. - * Garante que qualquer mensagem possa ser identificada e roteada. - * * Esta interface estende Serializable para permitir que os objetos que a implementam - * sejam enviados através de Sockets (ObjectOutputStream). + * Interface defining the contract for all messages exchanged in the simulator. + * Ensures that any message can be identified and routed. + * * This interface extends Serializable to allow objects that implement it + * to be sent over Sockets (ObjectOutputStream). * */ public interface MessageProtocol extends Serializable { /** - * Retorna o tipo da mensagem, indicando o seu propósito. - * @return O MessageType (ex: VEHICLE_TRANSFER, STATS_UPDATE). + * Returns the type of the message, indicating its purpose. + * @return The MessageType (e.g., VEHICLE_TRANSFER, STATS_UPDATE). */ MessageType getType(); /** - * Retorna o objeto de dados (carga útil) que esta mensagem transporta. - * O tipo de objeto dependerá do MessageType. - * * - Se getType() == VEHICLE_TRANSFER, o payload será um objeto {@link sd.model.Vehicle}. - * - Se getType() == STATS_UPDATE, o payload será um objeto de estatísticas. - * * @return O objeto de dados (payload), que também deve ser Serializable. + * Returns the data object (payload) that this message carries. + * The type of object will depend on the MessageType. + * * - If getType() == VEHICLE_TRANSFER, the payload will be a {@link sd.model.Vehicle} object. + * - If getType() == STATS_UPDATE, the payload will be a statistics object. + * * @return The data object (payload), which must also be Serializable. */ Object getPayload(); /** - * Retorna o ID do nó (Processo) que enviou esta mensagem. - * @return String (ex: "Cr1", "Cr5", "S"). + * Returns the ID of the node (Process) that sent this message. + * @return String (e.g., "Cr1", "Cr5", "S"). */ String getSourceNode(); /** - * Retorna o ID do nó (Processo) de destino desta mensagem. - * @return String (ex: "Cr2", "DashboardServer"). + * Returns the ID of the destination node (Process) for this message. + * @return String (e.g., "Cr2", "DashboardServer"). */ String getDestinationNode(); -} +} \ No newline at end of file diff --git a/main/src/main/java/sd/protocol/SocketConnection.java b/main/src/main/java/sd/protocol/SocketConnection.java new file mode 100644 index 0000000..d56ad9c --- /dev/null +++ b/main/src/main/java/sd/protocol/SocketConnection.java @@ -0,0 +1,5 @@ +package sd.protocol; + +public class SocketConnection { + +} From 96903e4b7c3456a30b14dd140fc627e4025ce027 Mon Sep 17 00:00:00 2001 From: Gaa56 Date: Sat, 25 Oct 2025 17:43:25 +0100 Subject: [PATCH 03/11] SocketConnection --- .../java/sd/protocol/SocketConnection.java | 110 +++++++++++++++++- 1 file changed, 108 insertions(+), 2 deletions(-) diff --git a/main/src/main/java/sd/protocol/SocketConnection.java b/main/src/main/java/sd/protocol/SocketConnection.java index d56ad9c..0198242 100644 --- a/main/src/main/java/sd/protocol/SocketConnection.java +++ b/main/src/main/java/sd/protocol/SocketConnection.java @@ -1,5 +1,111 @@ package sd.protocol; -public class SocketConnection { +import java.io.Closeable; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.net.Socket; +import java.net.UnknownHostException; -} +/** + * Wrapper class that simplifies communication via Sockets. + * * It encapsulates all stream logic (ObjectInputStream/ObjectOutputStream) + * so the rest of your code can simply "send" and "receive" objects + * that implement your MessageProtocol. + * * This is necessary to meet the requirement for inter-process communication + * (Intersections). + * * This class implements Closeable, so you can (and should) use it + * with a 'try-with-resources' block to ensure the socket is always closed. + */ +public class SocketConnection implements Closeable { + + private final Socket socket; + private final ObjectOutputStream outputStream; + private final ObjectInputStream inputStream; + + /** + * Constructor for the "Client" (who initiates the connection). + * Tries to connect to a process that is already listening (Server). + * + * @param host The host address (e.g., "localhost" from your simulation.properties) + * @param port The port (e.g., 8001 from your simulation.properties) + * @throws IOException If connection fails. + * @throws UnknownHostException If the host is not found. + */ + public SocketConnection(String host, int port) throws IOException, UnknownHostException { + this.socket = new Socket(host, port); + + // IMPORTANT: The order is crucial to prevent deadlocks when creating streams. + // The OutputStream (output stream) must be created first. + this.outputStream = new ObjectOutputStream(socket.getOutputStream()); + this.inputStream = new ObjectInputStream(socket.getInputStream()); + } + + /** + * Constructor for the "Server" (who accepts the connection). + * Receives a Socket that has already been accepted by a ServerSocket. + * + * @param acceptedSocket The Socket returned by serverSocket.accept(). + * @throws IOException If stream creation fails. + */ + public SocketConnection(Socket acceptedSocket) throws IOException { + this.socket = acceptedSocket; + + // IMPORTANT: The order is crucial. OutputStream (output stream) must be created first. + this.outputStream = new ObjectOutputStream(socket.getOutputStream()); + this.inputStream = new ObjectInputStream(socket.getInputStream()); + } + + /** + * Sends (serializes) a MessageProtocol object over the socket. + * + * @param message The "envelope" (which contains the Vehicle) to be sent. + * @throws IOException If writing to the stream fails. + */ + public void sendMessage(MessageProtocol message) throws IOException { + synchronized (outputStream) { + outputStream.writeObject(message); + outputStream.flush(); // Ensures the message is sent immediately. + } + } + + /** + * Tries to read (deserialize) a MessageProtocol object from the socket. + * This call is "blocked" until an object is received. + * + * @return The "envelope" (MessageProtocol) that was received. + * @throws IOException If the connection is lost or the stream is corrupted. + * @throws ClassNotFoundException If the received object is unknown. + */ + public MessageProtocol receiveMessage() throws IOException, ClassNotFoundException { + synchronized (inputStream) { + return (MessageProtocol) inputStream.readObject(); + } + } + + /** + * Closes the socket and all streams (Input and Output). + * It is called automatically if you use 'try-with-resources'. + */ + @Override + public void close() throws IOException { + try { + if (inputStream != null) inputStream.close(); + } catch (IOException e) { /* ignore */ } + + try { + if (outputStream != null) outputStream.close(); + } catch (IOException e) { /* ignore */ } + + if (socket != null && !socket.isClosed()) { + socket.close(); + } + } + + /** + * @return true if the socket is still connected. + */ + public boolean isConnected() { + return socket != null && socket.isConnected() && !socket.isClosed(); + } +} \ No newline at end of file From bc1a8da160d462ed26d1c1c00188b2e9a10be302 Mon Sep 17 00:00:00 2001 From: Gaa56 Date: Sat, 25 Oct 2025 18:00:58 +0100 Subject: [PATCH 04/11] Create MessageSerializer utility --- .../main/java/sd/util/MessageSerializer.java | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 main/src/main/java/sd/util/MessageSerializer.java diff --git a/main/src/main/java/sd/util/MessageSerializer.java b/main/src/main/java/sd/util/MessageSerializer.java new file mode 100644 index 0000000..2e7f461 --- /dev/null +++ b/main/src/main/java/sd/util/MessageSerializer.java @@ -0,0 +1,62 @@ +package sd.util; // Or sd.util if you prefer + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; + +import sd.protocol.MessageProtocol; + +/** + * Utility class for serializing and deserializing MessageProtocol objects. + * * NOTE: The SocketConnection class already handles serialization/deserialization + * automatically via ObjectOutputStream and ObjectInputStream directly + * on the socket stream. This class serves more as an example or for + * scenarios where you might want to manipulate the bytes directly + * (e.g., for sending via UDP or other means). + */ +public class MessageSerializer { + + /** + * Serializes a MessageProtocol object into a byte array. + * * @param message The MessageProtocol object to be serialized. + * @return A byte array representing the serialized object. + * @throws IOException If an error occurs during serialization. + */ + public static byte[] serialize(MessageProtocol message) throws IOException { + // Use a ByteArrayOutputStream to write bytes into memory + ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); + + // Use an ObjectOutputStream to write the object into the byteStream + try (ObjectOutputStream objectStream = new ObjectOutputStream(byteStream)) { + objectStream.writeObject(message); + } // The try-with-resources automatically closes the objectStream + + // Return the resulting bytes + return byteStream.toByteArray(); + } + + /** + * Deserializes a byte array back into a MessageProtocol object. + * * @param data The byte array to be deserialized. + * @return The reconstructed MessageProtocol object. + * @throws IOException If an error occurs while reading the bytes. + * @throws ClassNotFoundException If the class of the serialized object cannot be found. + */ + public static MessageProtocol deserialize(byte[] data) throws IOException, ClassNotFoundException { + // Use a ByteArrayInputStream to read from the byte array + ByteArrayInputStream byteStream = new ByteArrayInputStream(data); + + // Use an ObjectInputStream to read the object from the byteStream + try (ObjectInputStream objectStream = new ObjectInputStream(byteStream)) { + // Read the object and cast it to MessageProtocol + return (MessageProtocol) objectStream.readObject(); + } // The try-with-resources automatically closes the objectStream + } + + // Private constructor to prevent instantiation of the utility class + private MessageSerializer() { + throw new UnsupportedOperationException("This is a utility class and cannot be instantiated."); + } +} \ No newline at end of file From 1524188b29ec2539d9b24a59c203be3222d87d2f Mon Sep 17 00:00:00 2001 From: Gaa56 Date: Sun, 26 Oct 2025 17:00:34 +0000 Subject: [PATCH 05/11] Add connection retry logic --- .../java/sd/protocol/SocketConnection.java | 120 ++++++++++++++---- 1 file changed, 96 insertions(+), 24 deletions(-) diff --git a/main/src/main/java/sd/protocol/SocketConnection.java b/main/src/main/java/sd/protocol/SocketConnection.java index 0198242..f6392a4 100644 --- a/main/src/main/java/sd/protocol/SocketConnection.java +++ b/main/src/main/java/sd/protocol/SocketConnection.java @@ -1,21 +1,18 @@ -package sd.protocol; +package sd.protocol; import java.io.Closeable; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.net.ConnectException; import java.net.Socket; +import java.net.SocketTimeoutException; import java.net.UnknownHostException; +import java.util.concurrent.TimeUnit; /** * Wrapper class that simplifies communication via Sockets. - * * It encapsulates all stream logic (ObjectInputStream/ObjectOutputStream) - * so the rest of your code can simply "send" and "receive" objects - * that implement your MessageProtocol. - * * This is necessary to meet the requirement for inter-process communication - * (Intersections). - * * This class implements Closeable, so you can (and should) use it - * with a 'try-with-resources' block to ensure the socket is always closed. + * Includes connection retry logic for robustness. */ public class SocketConnection implements Closeable { @@ -23,46 +20,115 @@ public class SocketConnection implements Closeable { private final ObjectOutputStream outputStream; private final ObjectInputStream inputStream; + // --- Configuration for Retry Logic --- + /** Maximum number of connection attempts. */ + private static final int MAX_RETRIES = 5; + /** Delay between retry attempts in milliseconds. */ + private static final long RETRY_DELAY_MS = 1000; + /** * Constructor for the "Client" (who initiates the connection). * Tries to connect to a process that is already listening (Server). + * Includes retry logic in case of initial connection failure. * * @param host The host address (e.g., "localhost" from your simulation.properties) * @param port The port (e.g., 8001 from your simulation.properties) - * @throws IOException If connection fails. - * @throws UnknownHostException If the host is not found. + * @throws IOException If connection fails after all retries. + * @throws UnknownHostException If the host is not found (this error usually doesn't need retry). + * @throws InterruptedException If the thread is interrupted while waiting between retries. */ - public SocketConnection(String host, int port) throws IOException, UnknownHostException { - this.socket = new Socket(host, port); - - // IMPORTANT: The order is crucial to prevent deadlocks when creating streams. - // The OutputStream (output stream) must be created first. - this.outputStream = new ObjectOutputStream(socket.getOutputStream()); - this.inputStream = new ObjectInputStream(socket.getInputStream()); + public SocketConnection(String host, int port) throws IOException, UnknownHostException, InterruptedException { + Socket tempSocket = null; + IOException lastException = null; + + System.out.printf("[SocketConnection] Attempting to connect to %s:%d...%n", host, port); + + // --- Retry Loop --- + for (int attempt = 1; attempt <= MAX_RETRIES; attempt++) { + try { + // Try to establish the connection + tempSocket = new Socket(host, port); + + // If successful, break out of the retry loop + System.out.printf("[SocketConnection] Connected successfully on attempt %d.%n", attempt); + lastException = null; // Clear last error on success + break; + + } catch (ConnectException | SocketTimeoutException e) { + // These are common errors indicating the server might not be ready. + lastException = e; + System.out.printf("[SocketConnection] Attempt %d/%d failed: %s. Retrying in %d ms...%n", + attempt, MAX_RETRIES, e.getMessage(), RETRY_DELAY_MS); + + if (attempt < MAX_RETRIES) { + // Wait before the next attempt + TimeUnit.MILLISECONDS.sleep(RETRY_DELAY_MS); + } + } catch (IOException e) { + // Other IOExceptions might be more permanent, but we retry anyway. + lastException = e; + System.out.printf("[SocketConnection] Attempt %d/%d failed with IOException: %s. Retrying in %d ms...%n", + attempt, MAX_RETRIES, e.getMessage(), RETRY_DELAY_MS); + if (attempt < MAX_RETRIES) { + TimeUnit.MILLISECONDS.sleep(RETRY_DELAY_MS); + } + } + } // --- End of Retry Loop --- + + // If after all retries tempSocket is still null, it means connection failed permanently. + if (tempSocket == null) { + System.err.printf("[SocketConnection] Failed to connect to %s:%d after %d attempts.%n", host, port, MAX_RETRIES); + if (lastException != null) { + throw lastException; // Throw the last exception encountered + } else { + // Should not happen if loop ran, but as a fallback + throw new IOException("Failed to connect after " + MAX_RETRIES + " attempts, reason unknown."); + } + } + + // If connection was successful, assign to final variable and create streams + this.socket = tempSocket; + try { + // IMPORTANT: The order is crucial. OutputStream first. + this.outputStream = new ObjectOutputStream(socket.getOutputStream()); + this.inputStream = new ObjectInputStream(socket.getInputStream()); + } catch (IOException e) { + // If stream creation fails even after successful socket connection, clean up. + System.err.println("[SocketConnection] Failed to create streams after connection: " + e.getMessage()); + try { socket.close(); } catch (IOException closeEx) { /* ignore */ } + throw e; // Re-throw the stream creation exception + } } + /** * Constructor for the "Server" (who accepts the connection). * Receives a Socket that has already been accepted by a ServerSocket. + * No retry logic needed here as the connection is already established. * * @param acceptedSocket The Socket returned by serverSocket.accept(). * @throws IOException If stream creation fails. */ public SocketConnection(Socket acceptedSocket) throws IOException { this.socket = acceptedSocket; - - // IMPORTANT: The order is crucial. OutputStream (output stream) must be created first. + + // IMPORTANT: The order is crucial. OutputStream first. this.outputStream = new ObjectOutputStream(socket.getOutputStream()); this.inputStream = new ObjectInputStream(socket.getInputStream()); + System.out.printf("[SocketConnection] Connection accepted from %s:%d.%n", + acceptedSocket.getInetAddress().getHostAddress(), acceptedSocket.getPort()); } /** * Sends (serializes) a MessageProtocol object over the socket. * * @param message The "envelope" (which contains the Vehicle) to be sent. - * @throws IOException If writing to the stream fails. + * @throws IOException If writing to the stream fails or socket is not connected. */ public void sendMessage(MessageProtocol message) throws IOException { + if (!isConnected()) { + throw new IOException("Socket is not connected."); + } synchronized (outputStream) { outputStream.writeObject(message); outputStream.flush(); // Ensures the message is sent immediately. @@ -74,10 +140,13 @@ public class SocketConnection implements Closeable { * This call is "blocked" until an object is received. * * @return The "envelope" (MessageProtocol) that was received. - * @throws IOException If the connection is lost or the stream is corrupted. + * @throws IOException If the connection is lost, the stream is corrupted, or socket is not connected. * @throws ClassNotFoundException If the received object is unknown. */ public MessageProtocol receiveMessage() throws IOException, ClassNotFoundException { + if (!isConnected()) { + throw new IOException("Socket is not connected."); + } synchronized (inputStream) { return (MessageProtocol) inputStream.readObject(); } @@ -89,21 +158,24 @@ public class SocketConnection implements Closeable { */ @Override public void close() throws IOException { + System.out.printf("[SocketConnection] Closing connection to %s:%d.%n", + socket != null ? socket.getInetAddress().getHostAddress() : "N/A", + socket != null ? socket.getPort() : -1); try { if (inputStream != null) inputStream.close(); } catch (IOException e) { /* ignore */ } - + try { if (outputStream != null) outputStream.close(); } catch (IOException e) { /* ignore */ } - + if (socket != null && !socket.isClosed()) { socket.close(); } } /** - * @return true if the socket is still connected. + * @return true if the socket is still connected and not closed. */ public boolean isConnected() { return socket != null && socket.isConnected() && !socket.isClosed(); From 06c34a198a97ab48d19e6c6f92ac6806f05d76c3 Mon Sep 17 00:00:00 2001 From: Gaa56 Date: Mon, 27 Oct 2025 09:15:33 +0000 Subject: [PATCH 06/11] Removed MessageSerializer --- main/src/main/java/sd/util/MessageSerializer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/src/main/java/sd/util/MessageSerializer.java b/main/src/main/java/sd/util/MessageSerializer.java index 2e7f461..cd3e4ed 100644 --- a/main/src/main/java/sd/util/MessageSerializer.java +++ b/main/src/main/java/sd/util/MessageSerializer.java @@ -1,4 +1,4 @@ -package sd.util; // Or sd.util if you prefer +package sd.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; From d8b59cc502503a6312038f786ea681afa9f6f983 Mon Sep 17 00:00:00 2001 From: Gaa56 Date: Mon, 27 Oct 2025 09:18:33 +0000 Subject: [PATCH 07/11] Deleted MessageSerializer --- .../main/java/sd/util/MessageSerializer.java | 62 ------------------- 1 file changed, 62 deletions(-) delete mode 100644 main/src/main/java/sd/util/MessageSerializer.java diff --git a/main/src/main/java/sd/util/MessageSerializer.java b/main/src/main/java/sd/util/MessageSerializer.java deleted file mode 100644 index cd3e4ed..0000000 --- a/main/src/main/java/sd/util/MessageSerializer.java +++ /dev/null @@ -1,62 +0,0 @@ -package sd.util; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; - -import sd.protocol.MessageProtocol; - -/** - * Utility class for serializing and deserializing MessageProtocol objects. - * * NOTE: The SocketConnection class already handles serialization/deserialization - * automatically via ObjectOutputStream and ObjectInputStream directly - * on the socket stream. This class serves more as an example or for - * scenarios where you might want to manipulate the bytes directly - * (e.g., for sending via UDP or other means). - */ -public class MessageSerializer { - - /** - * Serializes a MessageProtocol object into a byte array. - * * @param message The MessageProtocol object to be serialized. - * @return A byte array representing the serialized object. - * @throws IOException If an error occurs during serialization. - */ - public static byte[] serialize(MessageProtocol message) throws IOException { - // Use a ByteArrayOutputStream to write bytes into memory - ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); - - // Use an ObjectOutputStream to write the object into the byteStream - try (ObjectOutputStream objectStream = new ObjectOutputStream(byteStream)) { - objectStream.writeObject(message); - } // The try-with-resources automatically closes the objectStream - - // Return the resulting bytes - return byteStream.toByteArray(); - } - - /** - * Deserializes a byte array back into a MessageProtocol object. - * * @param data The byte array to be deserialized. - * @return The reconstructed MessageProtocol object. - * @throws IOException If an error occurs while reading the bytes. - * @throws ClassNotFoundException If the class of the serialized object cannot be found. - */ - public static MessageProtocol deserialize(byte[] data) throws IOException, ClassNotFoundException { - // Use a ByteArrayInputStream to read from the byte array - ByteArrayInputStream byteStream = new ByteArrayInputStream(data); - - // Use an ObjectInputStream to read the object from the byteStream - try (ObjectInputStream objectStream = new ObjectInputStream(byteStream)) { - // Read the object and cast it to MessageProtocol - return (MessageProtocol) objectStream.readObject(); - } // The try-with-resources automatically closes the objectStream - } - - // Private constructor to prevent instantiation of the utility class - private MessageSerializer() { - throw new UnsupportedOperationException("This is a utility class and cannot be instantiated."); - } -} \ No newline at end of file From 684fb408efb14251d3f9c5a9ab8dd0ea9b13a682 Mon Sep 17 00:00:00 2001 From: David Alves Date: Mon, 27 Oct 2025 22:53:37 +0000 Subject: [PATCH 08/11] Create IntersectionProcess main class --- .../src/main/java/sd/IntersectionProcess.java | 565 ++++++++++++++++++ 1 file changed, 565 insertions(+) create mode 100644 main/src/main/java/sd/IntersectionProcess.java diff --git a/main/src/main/java/sd/IntersectionProcess.java b/main/src/main/java/sd/IntersectionProcess.java new file mode 100644 index 0000000..cbe7cef --- /dev/null +++ b/main/src/main/java/sd/IntersectionProcess.java @@ -0,0 +1,565 @@ +package sd; + +import java.io.IOException; +import java.net.ServerSocket; +import java.net.Socket; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; + +import sd.config.SimulationConfig; +import sd.model.Intersection; +import sd.model.MessageType; +import sd.model.TrafficLight; +import sd.model.TrafficLightState; +import sd.model.Vehicle; +import sd.protocol.MessageProtocol; +import sd.protocol.SocketConnection; + +/** + * Main class for an Intersection Process in the distributed traffic simulation. + * * Each IntersectionProcess runs as an independent Java application (JVM instance) + * representing one of the five intersections (Cr1-Cr5) in the network. + */ +public class IntersectionProcess { + + private final String intersectionId; + + private final SimulationConfig config; + + private final Intersection intersection; + + private ServerSocket serverSocket; + + private final Map outgoingConnections; + + private final ExecutorService connectionHandlerPool; + + private final ExecutorService trafficLightPool; + + private volatile boolean running; //Quando uma thread escreve um valor volatile, todas as outras + //threads veem a mudança imediatamente. + + /** + * Constructs a new IntersectionProcess. + * + * @param intersectionId The ID of this intersection (e.g., "Cr1"). + * @param configFilePath Path to the simulation.properties file. + * @throws IOException If configuration cannot be loaded. + */ + public IntersectionProcess(String intersectionId, String configFilePath) throws IOException { + this.intersectionId = intersectionId; + this.config = new SimulationConfig(configFilePath); + this.intersection = new Intersection(intersectionId); + this.outgoingConnections = new HashMap<>(); + this.connectionHandlerPool = Executors.newCachedThreadPool(); + this.trafficLightPool = Executors.newFixedThreadPool(4); // Max 4 directions + this.running = false; + + System.out.println("=".repeat(60)); + System.out.println("INTERSECTION PROCESS: " + intersectionId); + System.out.println("=".repeat(60)); + } + + public void initialize() { + System.out.println("\n[" + intersectionId + "] Initializing intersection..."); + + createTrafficLights(); + + configureRouting(); + + startTrafficLights(); + + System.out.println("[" + intersectionId + "] Initialization complete."); + } + + /** + * Creates traffic lights for this intersection based on its physical connections. + * Each intersection has different number and directions of traffic lights + * according to the network topology. + */ + private void createTrafficLights() { + System.out.println("\n[" + intersectionId + "] Creating traffic lights..."); + + // Define directions based on the actual network topology + String[] directions; + switch (intersectionId) { + case "Cr1": + // Cr1: East (to Cr2), South (to Cr4), West (from Cr2) + directions = new String[]{"East", "South", "West"}; + break; + case "Cr2": + // Cr2: West (to Cr1), East (to Cr3), South (to Cr5) + // Plus receiving from Cr1 and Cr3 + directions = new String[]{"West", "East", "South"}; + break; + case "Cr3": + // Cr3: West (to Cr2), East (to S) + directions = new String[]{"West", "East"}; + break; + case "Cr4": + // Cr4: East (to Cr5), plus pedestrian crossing + directions = new String[]{"East"}; + break; + case "Cr5": + // Cr5: East (to S), receives from Cr2 and Cr4 + directions = new String[]{"East"}; + break; + default: + // Fallback to all directions + directions = new String[]{"North", "South", "East", "West"}; + } + + for (String direction : directions) { + double greenTime = config.getTrafficLightGreenTime(intersectionId, direction); + double redTime = config.getTrafficLightRedTime(intersectionId, direction); + + TrafficLight light = new TrafficLight( + intersectionId + "-" + direction, + direction, + greenTime, + redTime + ); + + intersection.addTrafficLight(light); + System.out.println(" Created traffic light: " + direction + + " (Green: " + greenTime + "s, Red: " + redTime + "s)"); + } + } + + private void configureRouting() { + System.out.println("\n[" + intersectionId + "] Configuring routing..."); + + switch (intersectionId) { + case "Cr1": + // Cr1 connections: → Cr2 (East), → Cr4 (South), ← Cr2 (West) + intersection.configureRoute("Cr2", "East"); // Go to Cr2 + intersection.configureRoute("Cr4", "South"); // Go to Cr4 + // Routes through other intersections to reach S + intersection.configureRoute("S", "East"); // S via Cr2 + break; + + case "Cr2": + // Cr2 connections: ↔ Cr1 (West/East), ↔ Cr3 (East/West), → Cr5 (South) + intersection.configureRoute("Cr1", "West"); // Go to Cr1 + intersection.configureRoute("Cr3", "East"); // Go to Cr3 + intersection.configureRoute("Cr5", "South"); // Go to Cr5 + intersection.configureRoute("S", "South"); // S via Cr5 or direct + break; + + case "Cr3": + // Cr3 connections: ← Cr2 (West), → S (South/East) + intersection.configureRoute("Cr2", "West"); // Go back to Cr2 + intersection.configureRoute("S", "East"); // Go to exit S + break; + + case "Cr4": + // Cr4 connections: → Cr5 (East) + intersection.configureRoute("Cr5", "East"); // Go to Cr5 + intersection.configureRoute("S", "East"); // S via Cr5 + break; + + case "Cr5": + // Cr5 connections: → S (East/South) + intersection.configureRoute("S", "East"); // Go to exit S + // Cr5 might also receive from Cr2 and Cr4 but doesn't route back + break; + + default: + System.err.println(" Warning: Unknown intersection ID: " + intersectionId); + } + + System.out.println(" Routing configured."); + } + + /** + * Starts all traffic light threads. + */ + private void startTrafficLights() { + System.out.println("\n[" + intersectionId + "] Starting traffic light threads..."); + + for (TrafficLight light : intersection.getTrafficLights()) { + trafficLightPool.submit(() -> runTrafficLightCycle(light)); + System.out.println(" Started thread for: " + light.getDirection()); + } + } + + /** + * The main loop for a traffic light thread. + * Continuously cycles between GREEN and RED states. + * + * @param light The traffic light to control. + */ + private void runTrafficLightCycle(TrafficLight light) { + System.out.println("[" + light.getId() + "] Traffic light thread started."); + + while (running) { + try { + // GREEN phase + light.changeState(TrafficLightState.GREEN); + System.out.println("[" + light.getId() + "] State: GREEN"); + + // Process vehicles while green + processGreenLight(light); + + // Wait for green duration + Thread.sleep((long) (light.getGreenTime() * 1000)); + + // RED phase + light.changeState(TrafficLightState.RED); + System.out.println("[" + light.getId() + "] State: RED"); + + // Wait for red duration + Thread.sleep((long) (light.getRedTime() * 1000)); + + } catch (InterruptedException e) { + System.out.println("[" + light.getId() + "] Traffic light thread interrupted."); + break; + } + } + + System.out.println("[" + light.getId() + "] Traffic light thread stopped."); + } + + /** + * Processes vehicles when a traffic light is GREEN. + * Dequeues vehicles and sends them to their next destination. + * + * @param light The traffic light that is currently green. + */ + private void processGreenLight(TrafficLight light) { + while (light.getState() == TrafficLightState.GREEN && light.getQueueSize() > 0) { + Vehicle vehicle = light.removeVehicle(); + + if (vehicle != null) { + // Get crossing time based on vehicle type + double crossingTime = getCrossingTimeForVehicle(vehicle); + + // Simulate crossing time + try { + Thread.sleep((long) (crossingTime * 1000)); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + break; + } + + // Update vehicle statistics + vehicle.addCrossingTime(crossingTime); + + // Update intersection statistics + intersection.incrementVehiclesSent(); + + // Send vehicle to next destination + sendVehicleToNextDestination(vehicle); + } + } + } + + /** + * Gets the crossing time for a vehicle based on its type. + * + * @param vehicle The vehicle. + * @return The crossing time in seconds. + */ + private double getCrossingTimeForVehicle(Vehicle vehicle) { + switch (vehicle.getType()) { + case BIKE: + return config.getBikeVehicleCrossingTime(); + case LIGHT: + return config.getLightVehicleCrossingTime(); + case HEAVY: + return config.getHeavyVehicleCrossingTime(); + default: + return config.getLightVehicleCrossingTime(); + } + } + + /** + * Sends a vehicle to its next destination via socket connection. + * + * @param vehicle The vehicle that has crossed this intersection. + */ + private void sendVehicleToNextDestination(Vehicle vehicle) { + String nextDestination = vehicle.getCurrentDestination(); + + try { + // Get or create connection to next destination + SocketConnection connection = getOrCreateConnection(nextDestination); + + // Create and send message + MessageProtocol message = new VehicleTransferMessage( + intersectionId, + nextDestination, + vehicle + ); + + connection.sendMessage(message); + + System.out.println("[" + intersectionId + "] Sent vehicle " + vehicle.getId() + + " to " + nextDestination); + + // Update vehicle's path - advance to next destination in route + vehicle.advanceRoute(); + + } catch (IOException | InterruptedException e) { + System.err.println("[" + intersectionId + "] Failed to send vehicle " + + vehicle.getId() + " to " + nextDestination + ": " + e.getMessage()); + } + } + + /** + * Gets an existing connection to a destination or creates a new one. + * + * @param destinationId The ID of the destination node. + * @return The SocketConnection to that destination. + * @throws IOException If connection cannot be established. + * @throws InterruptedException If connection attempt is interrupted. + */ + private synchronized SocketConnection getOrCreateConnection(String destinationId) + throws IOException, InterruptedException { + + if (!outgoingConnections.containsKey(destinationId)) { + String host = getHostForDestination(destinationId); + int port = getPortForDestination(destinationId); + + System.out.println("[" + intersectionId + "] Creating connection to " + + destinationId + " at " + host + ":" + port); + + SocketConnection connection = new SocketConnection(host, port); + outgoingConnections.put(destinationId, connection); + } + + return outgoingConnections.get(destinationId); + } + + /** + * Gets the host address for a destination node from configuration. + * + * @param destinationId The destination node ID. + * @return The host address. + */ + private String getHostForDestination(String destinationId) { + if (destinationId.equals("S")) { + return config.getExitHost(); + } else if (destinationId.startsWith("Cr")) { + return config.getIntersectionHost(destinationId); + } else { + return config.getDashboardHost(); + } + } + + /** + * Gets the port number for a destination node from configuration. + * + * @param destinationId The destination node ID. + * @return The port number. + */ + private int getPortForDestination(String destinationId) { + if (destinationId.equals("S")) { + return config.getExitPort(); + } else if (destinationId.startsWith("Cr")) { + return config.getIntersectionPort(destinationId); + } else { + return config.getDashboardPort(); + } + } + + /** + * Starts the server socket and begins accepting incoming connections. + * This is the main listening loop of the process. + * + * @throws IOException If the server socket cannot be created. + */ + public void start() throws IOException { + int port = config.getIntersectionPort(intersectionId); + serverSocket = new ServerSocket(port); + running = true; + + System.out.println("\n[" + intersectionId + "] Server started on port " + port); + System.out.println("[" + intersectionId + "] Waiting for incoming connections...\n"); + + // Main accept loop + while (running) { + try { + Socket clientSocket = serverSocket.accept(); + + // Handle each connection in a separate thread + connectionHandlerPool.submit(() -> handleIncomingConnection(clientSocket)); + + } catch (IOException e) { + if (running) { + System.err.println("[" + intersectionId + "] Error accepting connection: " + + e.getMessage()); + } + } + } + } + + /** + * Handles an incoming connection from another process. + * Continuously listens for vehicle transfer messages. + * + * @param clientSocket The accepted socket connection. + */ + private void handleIncomingConnection(Socket clientSocket) { + try (SocketConnection connection = new SocketConnection(clientSocket)) { + + System.out.println("[" + intersectionId + "] New connection accepted from " + + clientSocket.getInetAddress().getHostAddress()); + + // Continuously receive messages while connection is active + while (running && connection.isConnected()) { + try { + MessageProtocol message = connection.receiveMessage(); + + if (message.getType() == MessageType.VEHICLE_TRANSFER) { + Vehicle vehicle = (Vehicle) message.getPayload(); + + System.out.println("[" + intersectionId + "] Received vehicle: " + + vehicle.getId() + " from " + message.getSourceNode()); + + // Add vehicle to appropriate queue + intersection.receiveVehicle(vehicle); + } + + } catch (ClassNotFoundException e) { + System.err.println("[" + intersectionId + "] Unknown message type received: " + + e.getMessage()); + } + } + + } catch (IOException e) { + if (running) { + System.err.println("[" + intersectionId + "] Connection error: " + e.getMessage()); + } + } + } + + /** + * Stops the intersection process gracefully. + * Shuts down all threads and closes all connections. + */ + public void shutdown() { + System.out.println("\n[" + intersectionId + "] Shutting down..."); + running = false; + + // Close server socket + try { + if (serverSocket != null && !serverSocket.isClosed()) { + serverSocket.close(); + } + } catch (IOException e) { + System.err.println("[" + intersectionId + "] Error closing server socket: " + + e.getMessage()); + } + + // Shutdown thread pools + trafficLightPool.shutdown(); + connectionHandlerPool.shutdown(); + + try { + if (!trafficLightPool.awaitTermination(5, TimeUnit.SECONDS)) { + trafficLightPool.shutdownNow(); + } + if (!connectionHandlerPool.awaitTermination(5, TimeUnit.SECONDS)) { + connectionHandlerPool.shutdownNow(); + } + } catch (InterruptedException e) { + trafficLightPool.shutdownNow(); + connectionHandlerPool.shutdownNow(); + } + + // Close all outgoing connections + for (Map.Entry entry : outgoingConnections.entrySet()) { + try { + entry.getValue().close(); + } catch (IOException e) { + System.err.println("[" + intersectionId + "] Error closing connection to " + + entry.getKey() + ": " + e.getMessage()); + } + } + + System.out.println("[" + intersectionId + "] Shutdown complete."); + System.out.println("=".repeat(60)); + } + + /** + * Main method to start an intersection process. + * + * @param args Command-line arguments: + * args[0] - Intersection ID (required, e.g., "Cr1") + * args[1] - Config file path (optional, defaults to "simulation.properties") + */ + public static void main(String[] args) { + if (args.length < 1) { + System.err.println("Usage: java IntersectionProcess [configFile]"); + System.err.println("Example: java IntersectionProcess Cr1"); + System.exit(1); + } + + String intersectionId = args[0]; + String configFile = args.length > 1 ? args[1] : "simulation.properties"; + + IntersectionProcess process = null; + + try { + process = new IntersectionProcess(intersectionId, configFile); + process.initialize(); + + // Add shutdown hook for graceful termination + final IntersectionProcess finalProcess = process; + Runtime.getRuntime().addShutdownHook(new Thread(() -> { + finalProcess.shutdown(); + })); + + // Start the process + process.start(); + + } catch (IOException e) { + System.err.println("Error starting intersection process: " + e.getMessage()); + e.printStackTrace(); + System.exit(1); + } + } + + // --- Inner class for Vehicle Transfer Messages --- + + /** + * Implementation of MessageProtocol for vehicle transfers between processes. + */ + private static class VehicleTransferMessage implements MessageProtocol { + private static final long serialVersionUID = 1L; + + private final String sourceNode; + private final String destinationNode; + private final Vehicle payload; + + public VehicleTransferMessage(String sourceNode, String destinationNode, Vehicle vehicle) { + this.sourceNode = sourceNode; + this.destinationNode = destinationNode; + this.payload = vehicle; + } + + @Override + public MessageType getType() { + return MessageType.VEHICLE_TRANSFER; + } + + @Override + public Object getPayload() { + return payload; + } + + @Override + public String getSourceNode() { + return sourceNode; + } + + @Override + public String getDestinationNode() { + return destinationNode; + } + } +} From dab0651dbde763aa32eb7c7867ca59e68042973b Mon Sep 17 00:00:00 2001 From: David Alves Date: Wed, 29 Oct 2025 22:36:58 +0000 Subject: [PATCH 09/11] Corrected directions --- .../src/main/java/sd/IntersectionProcess.java | 46 ++++++------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/main/src/main/java/sd/IntersectionProcess.java b/main/src/main/java/sd/IntersectionProcess.java index cbe7cef..606c5ac 100644 --- a/main/src/main/java/sd/IntersectionProcess.java +++ b/main/src/main/java/sd/IntersectionProcess.java @@ -83,33 +83,23 @@ public class IntersectionProcess { private void createTrafficLights() { System.out.println("\n[" + intersectionId + "] Creating traffic lights..."); - // Define directions based on the actual network topology - String[] directions; + String[] directions = new String[0]; switch (intersectionId) { case "Cr1": - // Cr1: East (to Cr2), South (to Cr4), West (from Cr2) - directions = new String[]{"East", "South", "West"}; + directions = new String[]{"East", "South"}; break; case "Cr2": - // Cr2: West (to Cr1), East (to Cr3), South (to Cr5) - // Plus receiving from Cr1 and Cr3 directions = new String[]{"West", "East", "South"}; break; case "Cr3": - // Cr3: West (to Cr2), East (to S) - directions = new String[]{"West", "East"}; + directions = new String[]{"West", "South"}; break; case "Cr4": - // Cr4: East (to Cr5), plus pedestrian crossing directions = new String[]{"East"}; break; case "Cr5": - // Cr5: East (to S), receives from Cr2 and Cr4 directions = new String[]{"East"}; break; - default: - // Fallback to all directions - directions = new String[]{"North", "South", "East", "West"}; } for (String direction : directions) { @@ -134,41 +124,31 @@ public class IntersectionProcess { switch (intersectionId) { case "Cr1": - // Cr1 connections: → Cr2 (East), → Cr4 (South), ← Cr2 (West) - intersection.configureRoute("Cr2", "East"); // Go to Cr2 - intersection.configureRoute("Cr4", "South"); // Go to Cr4 - // Routes through other intersections to reach S - intersection.configureRoute("S", "East"); // S via Cr2 + intersection.configureRoute("Cr2", "East"); + intersection.configureRoute("Cr4", "South"); break; case "Cr2": - // Cr2 connections: ↔ Cr1 (West/East), ↔ Cr3 (East/West), → Cr5 (South) - intersection.configureRoute("Cr1", "West"); // Go to Cr1 - intersection.configureRoute("Cr3", "East"); // Go to Cr3 - intersection.configureRoute("Cr5", "South"); // Go to Cr5 - intersection.configureRoute("S", "South"); // S via Cr5 or direct + intersection.configureRoute("Cr1", "West"); + intersection.configureRoute("Cr3", "East"); + intersection.configureRoute("Cr5", "South"); break; case "Cr3": - // Cr3 connections: ← Cr2 (West), → S (South/East) - intersection.configureRoute("Cr2", "West"); // Go back to Cr2 - intersection.configureRoute("S", "East"); // Go to exit S + intersection.configureRoute("Cr2", "West"); + intersection.configureRoute("S", "South"); break; case "Cr4": - // Cr4 connections: → Cr5 (East) - intersection.configureRoute("Cr5", "East"); // Go to Cr5 - intersection.configureRoute("S", "East"); // S via Cr5 + intersection.configureRoute("Cr5", "East"); break; case "Cr5": - // Cr5 connections: → S (East/South) - intersection.configureRoute("S", "East"); // Go to exit S - // Cr5 might also receive from Cr2 and Cr4 but doesn't route back + intersection.configureRoute("S", "East"); break; default: - System.err.println(" Warning: Unknown intersection ID: " + intersectionId); + System.err.println(" Error: unknown intersection ID: " + intersectionId); } System.out.println(" Routing configured."); From db5e01021ac1b791ed9eb4235eefa531603e4592 Mon Sep 17 00:00:00 2001 From: David Alves Date: Thu, 30 Oct 2025 10:41:17 +0000 Subject: [PATCH 10/11] Refactor IntersectionProcess and add unit tests --- .../src/main/java/sd/IntersectionProcess.java | 51 +- .../test/java/IntersectionProcessTest.java | 473 ++++++++++++++++++ 2 files changed, 477 insertions(+), 47 deletions(-) create mode 100644 main/src/test/java/IntersectionProcessTest.java diff --git a/main/src/main/java/sd/IntersectionProcess.java b/main/src/main/java/sd/IntersectionProcess.java index 606c5ac..66d55c8 100644 --- a/main/src/main/java/sd/IntersectionProcess.java +++ b/main/src/main/java/sd/IntersectionProcess.java @@ -177,7 +177,7 @@ public class IntersectionProcess { while (running) { try { - // GREEN phase + // Green state light.changeState(TrafficLightState.GREEN); System.out.println("[" + light.getId() + "] State: GREEN"); @@ -187,7 +187,7 @@ public class IntersectionProcess { // Wait for green duration Thread.sleep((long) (light.getGreenTime() * 1000)); - // RED phase + // RED state light.changeState(TrafficLightState.RED); System.out.println("[" + light.getId() + "] State: RED"); @@ -323,10 +323,8 @@ public class IntersectionProcess { private String getHostForDestination(String destinationId) { if (destinationId.equals("S")) { return config.getExitHost(); - } else if (destinationId.startsWith("Cr")) { - return config.getIntersectionHost(destinationId); } else { - return config.getDashboardHost(); + return config.getIntersectionHost(destinationId); } } @@ -339,10 +337,8 @@ public class IntersectionProcess { private int getPortForDestination(String destinationId) { if (destinationId.equals("S")) { return config.getExitPort(); - } else if (destinationId.startsWith("Cr")) { - return config.getIntersectionPort(destinationId); } else { - return config.getDashboardPort(); + return config.getIntersectionPort(destinationId); } } @@ -465,45 +461,6 @@ public class IntersectionProcess { System.out.println("=".repeat(60)); } - /** - * Main method to start an intersection process. - * - * @param args Command-line arguments: - * args[0] - Intersection ID (required, e.g., "Cr1") - * args[1] - Config file path (optional, defaults to "simulation.properties") - */ - public static void main(String[] args) { - if (args.length < 1) { - System.err.println("Usage: java IntersectionProcess [configFile]"); - System.err.println("Example: java IntersectionProcess Cr1"); - System.exit(1); - } - - String intersectionId = args[0]; - String configFile = args.length > 1 ? args[1] : "simulation.properties"; - - IntersectionProcess process = null; - - try { - process = new IntersectionProcess(intersectionId, configFile); - process.initialize(); - - // Add shutdown hook for graceful termination - final IntersectionProcess finalProcess = process; - Runtime.getRuntime().addShutdownHook(new Thread(() -> { - finalProcess.shutdown(); - })); - - // Start the process - process.start(); - - } catch (IOException e) { - System.err.println("Error starting intersection process: " + e.getMessage()); - e.printStackTrace(); - System.exit(1); - } - } - // --- Inner class for Vehicle Transfer Messages --- /** diff --git a/main/src/test/java/IntersectionProcessTest.java b/main/src/test/java/IntersectionProcessTest.java new file mode 100644 index 0000000..90de4f1 --- /dev/null +++ b/main/src/test/java/IntersectionProcessTest.java @@ -0,0 +1,473 @@ +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.net.Socket; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; + +import org.junit.jupiter.api.AfterEach; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.io.TempDir; + +import sd.IntersectionProcess; +import sd.model.MessageType; +import sd.model.Vehicle; +import sd.model.VehicleType; + +/** + * Tests for IntersectionProcess - covers initialization, traffic lights, + * vehicle transfer and network stuff + */ +public class IntersectionProcessTest { + + @TempDir + Path tempDir; + + private Path configFile; + private IntersectionProcess intersectionProcess; + + // setup test config before each test + @BeforeEach + public void setUp() throws IOException { + // create temp config file + configFile = tempDir.resolve("test-simulation.properties"); + + String configContent = """ + # Test Simulation Configuration + + # Intersection Network Configuration + intersection.Cr1.host=localhost + intersection.Cr1.port=18001 + intersection.Cr2.host=localhost + intersection.Cr2.port=18002 + intersection.Cr3.host=localhost + intersection.Cr3.port=18003 + intersection.Cr4.host=localhost + intersection.Cr4.port=18004 + intersection.Cr5.host=localhost + intersection.Cr5.port=18005 + + # Exit Configuration + exit.host=localhost + exit.port=18099 + + # Dashboard Configuration + dashboard.host=localhost + dashboard.port=18100 + + # Traffic Light Timing (seconds) + trafficLight.Cr1.East.greenTime=5.0 + trafficLight.Cr1.East.redTime=5.0 + trafficLight.Cr1.South.greenTime=5.0 + trafficLight.Cr1.South.redTime=5.0 + trafficLight.Cr1.West.greenTime=5.0 + trafficLight.Cr1.West.redTime=5.0 + + trafficLight.Cr2.West.greenTime=4.0 + trafficLight.Cr2.West.redTime=6.0 + trafficLight.Cr2.East.greenTime=4.0 + trafficLight.Cr2.East.redTime=6.0 + trafficLight.Cr2.South.greenTime=4.0 + trafficLight.Cr2.South.redTime=6.0 + + trafficLight.Cr3.West.greenTime=3.0 + trafficLight.Cr3.West.redTime=7.0 + trafficLight.Cr3.East.greenTime=3.0 + trafficLight.Cr3.East.redTime=7.0 + + trafficLight.Cr4.East.greenTime=6.0 + trafficLight.Cr4.East.redTime=4.0 + + trafficLight.Cr5.East.greenTime=5.0 + trafficLight.Cr5.East.redTime=5.0 + + # Vehicle Crossing Times (seconds) + vehicle.bike.crossingTime=2.0 + vehicle.light.crossingTime=3.0 + vehicle.heavy.crossingTime=5.0 + """; + + Files.writeString(configFile, configContent); + } + + // cleanup after tests + @AfterEach + public void tearDown() { + if (intersectionProcess != null) { + intersectionProcess.shutdown(); + } + } + + // ==================== Initialization Tests ==================== + + @Test + public void testConstructor_Success() throws IOException { + intersectionProcess = new IntersectionProcess("Cr1", configFile.toString()); + assertNotNull(intersectionProcess); + } + + @Test + public void testConstructor_InvalidConfig() { + Exception exception = assertThrows(IOException.class, () -> { + new IntersectionProcess("Cr1", "non-existent-config.properties"); + }); + assertNotNull(exception); + } + + @Test + public void testInitialize_Cr1() throws IOException { + intersectionProcess = new IntersectionProcess("Cr1", configFile.toString()); + assertDoesNotThrow(() -> intersectionProcess.initialize()); + } + + @Test + public void testInitialize_Cr2() throws IOException { + intersectionProcess = new IntersectionProcess("Cr2", configFile.toString()); + assertDoesNotThrow(() -> intersectionProcess.initialize()); + } + + @Test + public void testInitialize_Cr3() throws IOException { + intersectionProcess = new IntersectionProcess("Cr3", configFile.toString()); + assertDoesNotThrow(() -> intersectionProcess.initialize()); + } + + @Test + public void testInitialize_Cr4() throws IOException { + intersectionProcess = new IntersectionProcess("Cr4", configFile.toString()); + assertDoesNotThrow(() -> intersectionProcess.initialize()); + } + + @Test + public void testInitialize_Cr5() throws IOException { + intersectionProcess = new IntersectionProcess("Cr5", configFile.toString()); + assertDoesNotThrow(() -> intersectionProcess.initialize()); + } + + // traffic light creation tests + + @Test + public void testTrafficLightCreation_Cr1_HasCorrectDirections() throws IOException { + intersectionProcess = new IntersectionProcess("Cr1", configFile.toString()); + intersectionProcess.initialize(); + + // cant access private fields but initialization succeds + assertNotNull(intersectionProcess); + } + + @Test + public void testTrafficLightCreation_Cr3_HasCorrectDirections() throws IOException { + intersectionProcess = new IntersectionProcess("Cr3", configFile.toString()); + intersectionProcess.initialize(); + + // Cr3 has west and south only + assertNotNull(intersectionProcess); + } + + @Test + public void testTrafficLightCreation_Cr4_HasSingleDirection() throws IOException { + intersectionProcess = new IntersectionProcess("Cr4", configFile.toString()); + intersectionProcess.initialize(); + + // Cr4 only has east direction + assertNotNull(intersectionProcess); + } + + // server startup tests + + @Test + @Timeout(5) + public void testServerStart_BindsToCorrectPort() throws IOException, InterruptedException { + intersectionProcess = new IntersectionProcess("Cr1", configFile.toString()); + intersectionProcess.initialize(); + + // start server in seperate thread + Thread serverThread = new Thread(() -> { + try { + intersectionProcess.start(); + } catch (IOException e) { + // expected on shutdown + } + }); + serverThread.start(); + + Thread.sleep(500); // wait for server to start + + // try connecting to check if its running + try (Socket clientSocket = new Socket("localhost", 18001)) { + assertTrue(clientSocket.isConnected()); + } + + intersectionProcess.shutdown(); + serverThread.join(2000); + } + + @Test + @Timeout(5) + public void testServerStart_MultipleIntersections() throws IOException, InterruptedException { + // test 2 intersections on diferent ports + IntersectionProcess cr1 = new IntersectionProcess("Cr1", configFile.toString()); + IntersectionProcess cr2 = new IntersectionProcess("Cr2", configFile.toString()); + + cr1.initialize(); + cr2.initialize(); + + Thread thread1 = new Thread(() -> { + try { cr1.start(); } catch (IOException e) { } + }); + + Thread thread2 = new Thread(() -> { + try { cr2.start(); } catch (IOException e) { } + }); + + thread1.start(); + thread2.start(); + + Thread.sleep(500); + + // check both are running + try (Socket socket1 = new Socket("localhost", 18001); + Socket socket2 = new Socket("localhost", 18002)) { + assertTrue(socket1.isConnected()); + assertTrue(socket2.isConnected()); + } + + cr1.shutdown(); + cr2.shutdown(); + thread1.join(2000); + thread2.join(2000); + } + + // vehicle transfer tests + + @Test + @Timeout(10) + public void testVehicleTransfer_ReceiveVehicle() throws IOException, InterruptedException { + // setup reciever intersection + intersectionProcess = new IntersectionProcess("Cr2", configFile.toString()); + intersectionProcess.initialize(); + + Thread serverThread = new Thread(() -> { + try { + intersectionProcess.start(); + } catch (IOException e) { } + }); + serverThread.start(); + + Thread.sleep(500); + + // create test vehicle + java.util.List route = Arrays.asList("Cr2", "Cr3", "S"); + Vehicle vehicle = new Vehicle("V001", VehicleType.LIGHT, 0.0, route); + + // send vehicle from Cr1 to Cr2 + try (Socket socket = new Socket("localhost", 18002)) { + ObjectOutputStream out = new ObjectOutputStream(socket.getOutputStream()); + + TestVehicleMessage message = new TestVehicleMessage("Cr1", "Cr2", vehicle); + out.writeObject(message); + out.flush(); + + Thread.sleep(1000); // wait for procesing + } + + intersectionProcess.shutdown(); + serverThread.join(2000); + } + + // routing config tests + + @Test + public void testRoutingConfiguration_Cr1() throws IOException { + intersectionProcess = new IntersectionProcess("Cr1", configFile.toString()); + intersectionProcess.initialize(); + + // indirect test - if init works routing should be ok + assertNotNull(intersectionProcess); + } + + @Test + public void testRoutingConfiguration_Cr5() throws IOException { + intersectionProcess = new IntersectionProcess("Cr5", configFile.toString()); + intersectionProcess.initialize(); + + // Cr5 routes to exit + assertNotNull(intersectionProcess); + } + + // shutdown tests + + @Test + @Timeout(5) + public void testShutdown_GracefulTermination() throws IOException, InterruptedException { + intersectionProcess = new IntersectionProcess("Cr1", configFile.toString()); + intersectionProcess.initialize(); + + Thread serverThread = new Thread(() -> { + try { + intersectionProcess.start(); + } catch (IOException e) { } + }); + serverThread.start(); + + Thread.sleep(500); + + // shutdown should be fast + assertDoesNotThrow(() -> intersectionProcess.shutdown()); + + serverThread.join(2000); + } + + @Test + @Timeout(5) + public void testShutdown_ClosesServerSocket() throws IOException, InterruptedException { + intersectionProcess = new IntersectionProcess("Cr1", configFile.toString()); + intersectionProcess.initialize(); + + Thread serverThread = new Thread(() -> { + try { + intersectionProcess.start(); + } catch (IOException e) { } + }); + serverThread.start(); + + Thread.sleep(500); + + // verify server running + try (Socket socket = new Socket("localhost", 18001)) { + assertTrue(socket.isConnected()); + } + + intersectionProcess.shutdown(); + serverThread.join(2000); + + // after shutdown conection should fail + Thread.sleep(500); + Exception exception = assertThrows(IOException.class, () -> { + Socket socket = new Socket("localhost", 18001); + socket.close(); + }); + assertNotNull(exception); + } + + @Test + @Timeout(5) + public void testShutdown_StopsTrafficLightThreads() throws IOException, InterruptedException { + intersectionProcess = new IntersectionProcess("Cr1", configFile.toString()); + intersectionProcess.initialize(); + + Thread serverThread = new Thread(() -> { + try { + intersectionProcess.start(); + } catch (IOException e) { } + }); + serverThread.start(); + + Thread.sleep(500); + + int threadCountBefore = Thread.activeCount(); + + intersectionProcess.shutdown(); + serverThread.join(2000); + + Thread.sleep(500); // wait for threads to die + + // thread count should decrese (traffic light threads stop) + int threadCountAfter = Thread.activeCount(); + assertTrue(threadCountAfter <= threadCountBefore); + } + + // integration tests + + @Test + @Timeout(15) + public void testIntegration_TwoIntersectionsVehicleTransfer() throws IOException, InterruptedException { + // setup 2 intersections + IntersectionProcess cr1 = new IntersectionProcess("Cr1", configFile.toString()); + IntersectionProcess cr2 = new IntersectionProcess("Cr2", configFile.toString()); + + cr1.initialize(); + cr2.initialize(); + + // start both + Thread thread1 = new Thread(() -> { + try { cr1.start(); } catch (IOException e) { } + }); + + Thread thread2 = new Thread(() -> { + try { cr2.start(); } catch (IOException e) { } + }); + + thread1.start(); + thread2.start(); + + Thread.sleep(1000); // wait for servers + + // send vehicle to Cr1 that goes to Cr2 + java.util.List route = Arrays.asList("Cr1", "Cr2", "S"); + Vehicle vehicle = new Vehicle("V001", VehicleType.LIGHT, 0.0, route); + + try (Socket socket = new Socket("localhost", 18001)) { + ObjectOutputStream out = new ObjectOutputStream(socket.getOutputStream()); + + TestVehicleMessage message = new TestVehicleMessage("Entry", "Cr1", vehicle); + out.writeObject(message); + out.flush(); + + Thread.sleep(2000); // time for processing + } + + cr1.shutdown(); + cr2.shutdown(); + thread1.join(2000); + thread2.join(2000); + } + + @Test + public void testMain_MissingArguments() { + // main needs intersection ID as argument + // cant test System.exit easily in modern java + assertTrue(true, "Main method expects intersection ID as first argument"); + } + + // helper class for testing vehicle messages + private static class TestVehicleMessage implements sd.protocol.MessageProtocol { + private static final long serialVersionUID = 1L; + + private final String sourceNode; + private final String destinationNode; + private final Vehicle payload; + + public TestVehicleMessage(String sourceNode, String destinationNode, Vehicle vehicle) { + this.sourceNode = sourceNode; + this.destinationNode = destinationNode; + this.payload = vehicle; + } + + @Override + public MessageType getType() { + return MessageType.VEHICLE_TRANSFER; + } + + @Override + public Object getPayload() { + return payload; + } + + @Override + public String getSourceNode() { + return sourceNode; + } + + @Override + public String getDestinationNode() { + return destinationNode; + } + } +} From dc4f567e1f7de0db4c45cecb2de5c8cd707bb746 Mon Sep 17 00:00:00 2001 From: David Alves Date: Thu, 30 Oct 2025 15:57:58 +0000 Subject: [PATCH 11/11] Move vehicle route advancement to intersection arrival --- main/src/main/java/sd/IntersectionProcess.java | 3 +-- main/src/main/java/sd/model/Intersection.java | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/main/src/main/java/sd/IntersectionProcess.java b/main/src/main/java/sd/IntersectionProcess.java index 66d55c8..11db78d 100644 --- a/main/src/main/java/sd/IntersectionProcess.java +++ b/main/src/main/java/sd/IntersectionProcess.java @@ -280,8 +280,7 @@ public class IntersectionProcess { System.out.println("[" + intersectionId + "] Sent vehicle " + vehicle.getId() + " to " + nextDestination); - // Update vehicle's path - advance to next destination in route - vehicle.advanceRoute(); + // Note: vehicle route is advanced when it arrives at the next intersection } catch (IOException | InterruptedException e) { System.err.println("[" + intersectionId + "] Failed to send vehicle " + diff --git a/main/src/main/java/sd/model/Intersection.java b/main/src/main/java/sd/model/Intersection.java index 718c98c..4475fc3 100644 --- a/main/src/main/java/sd/model/Intersection.java +++ b/main/src/main/java/sd/model/Intersection.java @@ -104,16 +104,28 @@ public class Intersection { * Accepts an incoming vehicle and places it in the correct queue. * * This method: * 1. Increments the {@link #totalVehiclesReceived} counter. - * 2. Gets the vehicle's *next* destination (from {@link Vehicle#getCurrentDestination()}). - * 3. Uses the {@link #routing} map to find the correct *direction* for that destination. - * 4. Adds the vehicle to the queue of the {@link TrafficLight} for that direction. + * 2. Advances the vehicle's route (since it just arrived here) + * 3. Gets the vehicle's *next* destination (from {@link Vehicle#getCurrentDestination()}). + * 4. Uses the {@link #routing} map to find the correct *direction* for that destination. + * 5. Adds the vehicle to the queue of the {@link TrafficLight} for that direction. * * @param vehicle The {@link Vehicle} arriving at the intersection. */ public void receiveVehicle(Vehicle vehicle) { totalVehiclesReceived++; + // Advance route since vehicle just arrived at this intersection + vehicle.advanceRoute(); + String nextDestination = vehicle.getCurrentDestination(); + + // Check if vehicle reached final destination + if (nextDestination == null) { + System.out.printf("[%s] Vehicle %s reached final destination%n", + this.id, vehicle.getId()); + return; + } + String direction = routing.get(nextDestination); if (direction != null && trafficLights.containsKey(direction)) {