Merge branch 'main' into feature/easy-rts

Author: Sandro642

.github/workflows/work-jar.yml

@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - main
-      - Feature/AtomicFactory
 permissions:
   contents: write
   pages: write

build.gradle

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

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

@@ -167,7 +167,7 @@ public JobGetInfos urlBranch(URLProvider urlBranch) {
      * makes the API call, and returns the response as an ApiFactory object.
      * @return ApiFactory containing the response from the API, or null if an error occurs.
      */
-    public CompletableFuture<ApiFactory> getResponse() {
+    public CompletableFuture<ApiFactory> execute() {
         try {
             String route = (String) connectLib.StoreAndRetrieve().store.get("currentRoute");
             MethodType method = (MethodType) connectLib.StoreAndRetrieve().store.get("currentMethod");

src/main/java/fr/sandro642/github/provider/AtomicFactory.java

@@ -0,0 +1,18 @@
+package fr.sandro642.github.provider;
+
+import fr.sandro642.github.api.ApiFactory;
+
+import java.util.Map;
+
+public abstract class AtomicFactory {
+
+    private ApiFactory apiFactory;
+
+    protected void getPhysx(ApiFactory apiFactory) {
+        this.apiFactory = apiFactory;
+    }
+
+    protected Map<?,?> rawPhysx() {
+        return apiFactory.getRawData();
+    }
+}

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

@@ -6,6 +6,7 @@
 import fr.sandro642.github.enums.LangType;
 import fr.sandro642.github.enums.MethodType;
 import fr.sandro642.github.enums.ResourceType;
+import fr.sandro642.github.provider.AtomicFactory;
 import fr.sandro642.github.provider.RouteImport;
 import fr.sandro642.github.provider.URLProvider;
 import fr.sandro642.github.provider.VersionProvider;
@@ -44,6 +45,19 @@ public String getRoute() {
         }
     }
 
+    public class ClassheritFromFactory extends AtomicFactory {
+
+
+
+        public ClassheritFromFactory(ApiFactory apiFactory) {
+            getPhysx(apiFactory);
+        }
+
+        public Object getContent() {
+            return rawPhysx().get("content");
+        }
+    }
+
     /**
      * Example of URL branches, you can add multiple branches if you have multiple environments (dev, prod, etc.)
      */
@@ -94,8 +108,8 @@ public static void main(String[] args) {
             connectLib.Logger().showLogs();
 
              CompletableFuture<ApiFactory> apiFactoryCompletableFuture = connectLib.JobGetInfos()
-                    .getRoutes(null, MethodType.GET, TestRoutes.HELLO)
-                    .getResponse();
+                    .getRoutes(MethodType.GET, TestRoutes.HELLO)
+                    .execute();
 
              ApiFactory response = apiFactoryCompletableFuture.get(5, TimeUnit.SECONDS);
 
@@ -118,10 +132,8 @@ public void testUseFullRoute() {
             );
 
             CompletableFuture<ApiFactory> factoryCompletableFuture = connectLib.JobGetInfos()
-                    .getRoutes(null, MethodType.GET, TestRoutes.GREET)
-                    .urlBranch(ExampleUrlBranch.POST_PROD)
-                    .query(query)
-                    .getResponse();
+                    .getRoutes(MethodType.GET, TestRoutes.GREET)
+                    .execute();
 
             ApiFactory response = factoryCompletableFuture.get(5, TimeUnit.SECONDS);
 
@@ -148,7 +160,7 @@ public void testLangType() {
                      */
                     //.urlBranch(ExampleUrlBranch.LOCALHOST)
 
-                    .getResponse();
+                    .execute();
 
             ApiFactory response = factoryCompletableFuture.get(5, TimeUnit.SECONDS);
 
@@ -178,7 +190,7 @@ public void testSpecData() {
             CompletableFuture<ApiFactory> apiFactoryCompletableFuture = connectLib.JobGetInfos()
                     .getRoutes(TestCustomVersion.V1_API, MethodType.GET, TestRoutes.REQUEST_TOKEN)
                     .urlBranch(ExampleUrlBranch.PROD)
-                    .getResponse();
+                    .execute();
 
             ApiFactory apiFactory = apiFactoryCompletableFuture.get(5, TimeUnit.SECONDS);
 
@@ -222,23 +234,18 @@ public void pushsession() {
     public void startAppServices() {
         try {
             connectLib.Logger().showLogs();
-            connectLib.init(ResourceType.TEST_RESOURCES, LangType.ENGLISH, TestRoutes.class)
-                    .webServices(8080, "TestDashboard");
-
-            CompletableFuture<ApiFactory> apiFactoryCompletableFuture = connectLib.JobGetInfos()
-                    .getRoutes(null, MethodType.GET, TestRoutes.HELLO)
-                    .getResponse();
+            connectLib.init(ResourceType.TEST_RESOURCES, LangType.ENGLISH, TestRoutes.class);
+                    //.webServices(8080, "TestDashboard");
 
-            apiFactoryCompletableFuture = connectLib.JobGetInfos()
-                    .getRoutes(TestCustomVersion.V1_API ,MethodType.GET, TestRoutes.REQUEST_TOKEN)
-                    .urlBranch(ExampleUrlBranch.PROD)
-                    .getResponse();
-
-            ApiFactory apiFactory = apiFactoryCompletableFuture.get(5, TimeUnit.SECONDS);
+            CompletableFuture<ClassheritFromFactory> apiFactoryCompletableFuture = connectLib.JobGetInfos()
+                    .getRoutes(MethodType.GET, TestRoutes.HELLO)
+                    .urlBranch(ExampleUrlBranch.POST_PROD)
+                    .execute()
+                    .thenApply(ClassheritFromFactory::new);
 
-            System.out.println("Response: " + apiFactory.display());
+            ClassheritFromFactory classheritFromFactory = apiFactoryCompletableFuture.get(5, TimeUnit.SECONDS);
 
-            Thread.sleep(20000);
+            System.out.println("Response: " + classheritFromFactory.getContent());
 
         } catch (Exception e) {
             e.printStackTrace();