Merge pull request #49 from Sandro642/feature/multi-urlServer

Add URLProvider interface and update ApiClient to accept custom URLs

Author: Sandro642

README.md

@@ -17,7 +17,7 @@ And if you thought APIs were complicated, think again! With ConnectLib, it's lik
 ---
 
 ```java
-Stable Version: 0.3.7-STABLE
+Stable Version: 0.3.8-STABLE
 ```
 
 ---
@@ -115,7 +115,7 @@ repositories {
 
 dependencies {
 
-    implementation("fr.sandro642.github:ConnectLib:0.3.7-STABLE")
+    implementation("fr.sandro642.github:ConnectLib:0.3.8-STABLE")
 
 }
 

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'fr.sandro642.github'
-version = '0.3.7-STABLE'
+version = '0.3.8-STABLE'
 
 // Générer une classe de version automatiquement
 task generateVersionClass {

src/main/java/fr/sandro642/github/api/ApiClient.java

@@ -49,8 +49,8 @@ public class ApiClient extends ApiFactory {
      * It initializes the WebClient with the base URL from the ConnectLib configuration.
      * If the base URL is not found, it throws a RuntimeException.
      */
-    public ApiClient() {
-        String baseUrl = (String) connectLib.StoreAndRetrieve().store.get(connectLib.StoreAndRetrieve().URL_KEY);
+    public ApiClient(String baseUrlLambda) {
+        String baseUrl = baseUrlLambda;
 
         if (baseUrl == null) {
             connectLib.Logger().CRITICAL(connectLib.LangManager().getMessage(CategoriesType.APICLIENT_CLASS, "construct.urlbase"));

src/main/java/fr/sandro642/github/jobs/JobGetInfos.java

@@ -4,7 +4,6 @@
 import fr.sandro642.github.api.ApiClient;
 import fr.sandro642.github.api.ApiFactory;
 import fr.sandro642.github.enums.MethodType;
-import fr.sandro642.github.enums.VersionType;
 import fr.sandro642.github.enums.lang.CategoriesType;
 
 import java.util.Map;
@@ -27,19 +26,24 @@ public class JobGetInfos {
      * ApiClient is used to make API calls.
      * It is initialized in the constructor of JobGetInfos.
      */
-    private final ApiClient apiClient;
+    private ApiClient apiClient;
 
     /**
      * connectLib instance to access its methods and properties.
      */
     private ConnectLib connectLib = new ConnectLib();
 
+    /**
+     * URLProvider instance to provide custom URL branches.
+     * If not set, the default URL from the configuration will be used.
+     */
+    private URLProvider urlBranch;
+
     /**
      * Constructor of JobGetInfos.
      * Initializes the ApiClient and loads the YAML configuration.
      */
     public JobGetInfos() {
-        this.apiClient = new ApiClient();
         connectLib.YamlUtils();
     }
 
@@ -245,6 +249,18 @@ public <R> JobGetInfos getRoutes(VersionProvider versionType, MethodType methodT
         return this;
     }
 
+    /**
+     * Set a custom URL branch for the API calls.
+     * If not set, the default URL from the configuration will be used.
+     * @param urlBranch The URLProvider instance providing the custom URL branch.
+     * @return JobGetInfos for chaining
+     */
+    public JobGetInfos urlBranch(URLProvider urlBranch) {
+
+        this.urlBranch = urlBranch;
+        return this;
+    }
+
     /**
      * Get the response from the API based on the current route and method.
      * This method retrieves the stored route, method, and body from the store,
@@ -261,6 +277,16 @@ public CompletableFuture<ApiFactory> getResponse() {
                 connectLib.Logger().ERROR(connectLib.LangManager().getMessage(CategoriesType.JOBS_PACKAGE, "getresponse.mustbe"));
             }
 
+            /** Determine the URL branch to use */
+            String urlBranchLambda;
+
+            if (urlBranch == null) {
+                urlBranchLambda = (String) connectLib.StoreAndRetrieve().store.get(connectLib.StoreAndRetrieve().URL_KEY);
+            } else {
+                urlBranchLambda = urlBranch.getURL();
+            }
+            apiClient = new ApiClient(urlBranchLambda);
+
             CompletableFuture<ApiFactory> responseFuture = new CompletableFuture<>();
 
             // Callback to clean up the store after the response

src/main/java/fr/sandro642/github/jobs/URLProvider.java

@@ -0,0 +1,15 @@
+package fr.sandro642.github.jobs;
+
+/**
+ * URLProvider is an interface that provides a method to get the URL of a class implementing it.
+ * Classes implementing this interface must define the getURL() method to return their URL as a String
+ */
+
+public interface URLProvider {
+
+    /**
+     * Gets the URL of the class implementing this interface.
+     * @return the URL as a String
+     */
+    String getURL();
+}

src/test/java/fr/sandro642/github/test/MainTest.java

@@ -7,6 +7,7 @@
 import fr.sandro642.github.enums.MethodType;
 import fr.sandro642.github.enums.ResourceType;
 import fr.sandro642.github.jobs.RouteImport;
+import fr.sandro642.github.jobs.URLProvider;
 import fr.sandro642.github.jobs.VersionProvider;
 import fr.sandro642.github.misc.EnumLoader;
 import org.junit.jupiter.api.Test;
@@ -43,6 +44,22 @@ public String getRoute() {
         }
     }
 
+    public enum TestUrl implements URLProvider {
+        LOCALHOST("http://localhost:8080")
+        ;
+
+        private final String url;
+
+        TestUrl(String url) {
+            this.url = url;
+        }
+
+        @Override
+        public String getURL() {
+            return url;
+        }
+    }
+
     public enum TestCustomVersion implements VersionProvider {
         DEV_BRANCH("dev"),
         ;
@@ -71,7 +88,7 @@ public static void main(String[] args) {
             connectLib.Logger().showLogs();
 
              CompletableFuture<ApiFactory> apiFactoryCompletableFuture = connectLib.JobGetInfos()
-                    .getRoutes( MethodType.GET, TestRoutes.HELLO)
+                    .getRoutes(MethodType.GET, TestRoutes.HELLO)
                     .getResponse();
 
              ApiFactory response = apiFactoryCompletableFuture.get(5, TimeUnit.SECONDS);
@@ -125,28 +142,6 @@ public void testLangType() {
             System.out.println("Response: " + response.display());
             System.out.println("Status Code: " + response.getStatusCode());
 
-            Thread.sleep(5000);
-
-            factoryCompletableFuture = connectLib.JobGetInfos()
-                    .getRoutes(MethodType.GET, TestRoutes.GREET, null, null, Map.of("name", "Sandro642"))
-                    .getResponse();
-
-            response = factoryCompletableFuture.get(5, TimeUnit.SECONDS);
-
-            System.out.println("Response: " + response.display());
-            System.out.println("Status Code: " + response.getStatusCode());
-
-            Thread.sleep(5000);
-
-            factoryCompletableFuture = connectLib.JobGetInfos()
-                    .getRoutes(MethodType.GET, TestRoutes.GREET, null, null, Map.of("name", "Sandro642"))
-                    .getResponse();
-
-            response = factoryCompletableFuture.get(5, TimeUnit.SECONDS);
-
-            System.out.println("Response: " + response.display());
-            System.out.println("Status Code: " + response.getStatusCode());
-
         } catch (Exception e) {
             e.printStackTrace();
         }