Enhance connection management by adding dynamic port handling; update Request and RouteInfo classes to include port information

Author: Sandro642

src/main/java/fr/sandro642/github/spring/Application.java

@@ -4,6 +4,7 @@
 import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.web.reactive.config.WebFluxConfigurer;
 import reactor.core.publisher.ConnectableFlux;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
@@ -16,13 +17,20 @@
  */
 
 @SpringBootApplication
-public class Application {
+public class Application implements WebFluxConfigurer {
 
     // Singleton instance
     private static Application instance;
 
+    /**
+     * ConnectLib instance for managing connections.
+     */
     private static final ConnectLib connectLib = new ConnectLib();
 
+    /**
+     * Determines the port to use for the server, checking for a dynamic port first.
+     * @return the port number as a string
+     */
     private String Dyn_Port() {
         if (connectLib.StoreAndRetrieve().get(connectLib.StoreAndRetrieve().DYNAMIC_PORT) != null) {
             return connectLib.StoreAndRetrieve().get(connectLib.StoreAndRetrieve().DYNAMIC_PORT).toString();
@@ -31,6 +39,18 @@ private String Dyn_Port() {
         }
     }
 
+    /**
+     * Checks if the application is using a static port.
+     * @return true if using a static port, false if using a dynamic port
+     */
+    private boolean isStatic() {
+        if (connectLib.StoreAndRetrieve().get(connectLib.StoreAndRetrieve().DYNAMIC_PORT) != null) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
     /**
      * Starts the Spring Boot application in a non-blocking manner.
      * @return a Mono that completes when the application has started
@@ -42,7 +62,7 @@ public Mono<Void> startApplication() {
             app.setLogStartupInfo(false);                     // désactive l'info de démarrage
             Map<String, Object> props = new HashMap<>();
             props.put("server.port", Dyn_Port()); // définit le port du serveur
-            props.put("logging.level.root", "OFF");           // coupe l'affichage des logs
+            props.put("logging.level.root", "OFF");
             app.setDefaultProperties(props);
             app.run();
 

src/main/java/fr/sandro642/github/spring/controller/DataController.java

@@ -58,6 +58,7 @@ public static DataController getInstance() {
     @GetMapping("/status")
     public Map<String, Object> getStatus() {
         Map<String, Object> status = new HashMap<>();
+        status.put("portInfo", connectLib.StoreAndRetrieve().get(connectLib.StoreAndRetrieve().DYNAMIC_PORT));
         status.put("isInitialized", connectLib.isInitialized());
         status.put("resourceType", connectLib.HookManager().getResourceType());
         return status;
@@ -73,7 +74,7 @@ public List<RouteInfo> getRoutes() {
         List<RouteInfo> result = new ArrayList<>();
         if (map != null) {
             for (Map.Entry<String, String> e : map.entrySet()) {
-                result.add(new RouteInfo(e.getKey(), e.getValue()));
+                result.add(new RouteInfo(connectLib.StoreAndRetrieve().get(connectLib.StoreAndRetrieve().DYNAMIC_PORT).toString(), e.getKey(), e.getValue()));
             }
         }
         return result;
@@ -108,7 +109,7 @@ public Request createRequest(String route, String branch) {
         }
         long id = requestIdCounter.incrementAndGet();
 
-        Request req = new Request(id, route, branch, "pending");
+        Request req = new Request(connectLib.StoreAndRetrieve().get(connectLib.StoreAndRetrieve().DYNAMIC_PORT).toString(), id, route, branch, "pending");
         requestsMap.put(id, req);
         return req;
     }

src/main/java/fr/sandro642/github/spring/dto/Request.java

@@ -9,6 +9,11 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Request {
 
+    /**
+     * Port information of the request.
+     */
+    private String infoPort;
+
     /**
      * Unique identifier for the request
      */
@@ -36,12 +41,14 @@ public Request() {}
 
     /**
      * Parameterized constructor
+     * @param infoPort Port information of the request
      * @param id Unique identifier for the request
      * @param route Route associated with the request
      * @param branch Branch associated with the request
      * @param status Status of the request
      */
-    public Request(Long id, String route, String branch, String status) {
+    public Request(String infoPort, Long id, String route, String branch, String status) {
+        this.infoPort = infoPort;
         this.id = id;
         this.route = route;
         this.branch = branch;

src/main/java/fr/sandro642/github/spring/dto/RouteInfo.java

@@ -6,6 +6,11 @@
 
 public class RouteInfo {
 
+    /**
+     * Port information of the route.
+     */
+    private String infoPort;
+
     /**
      * Name of the route.
      */
@@ -26,7 +31,8 @@ public RouteInfo() {}
      * @param name Name of the route
      * @param url URL of the route
      */
-    public RouteInfo(String name, String url) {
+    public RouteInfo(String infoPort, String name, String url) {
+        this.infoPort = infoPort;
         this.name = name;
         this.url = url;
     }