Refactor ApiClient and ApiFactory: change ConnectLib to non-final and improve code readability

Author: Sandro642

README.md

@@ -100,7 +100,7 @@ Imagine an API that doesn't just connect services, but becomes the conductor of
 More examples HERE: [ExampleUsages.java](src/main/java/fr/sandro642/github/example/ExampleUsages.java)
 
 ---
-
+[build.gradle](build.gradle)
 ## 📚 Project Structure
 
 - `src/main/java/fr/sandro642/github/` : main source code

build.gradle

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

src/main/java/fr/sandro642/github/ConnectLib.java

@@ -1,13 +1,13 @@
 package fr.sandro642.github;
 
 import fr.sandro642.github.enums.LangType;
-import fr.sandro642.github.enums.ResourceType;
 import fr.sandro642.github.enums.lang.CategoriesType;
 import fr.sandro642.github.hook.HookManager;
 import fr.sandro642.github.hook.LangSupport;
 import fr.sandro642.github.hook.MCSupport;
-import fr.sandro642.github.jobs.JobGetInfos;
 import fr.sandro642.github.misc.*;
+import fr.sandro642.github.jobs.JobGetInfos;
+import fr.sandro642.github.enums.ResourceType;
 import fr.sandro642.github.update.RetrieveLastVersion;
 
 import java.util.HashMap;
@@ -16,7 +16,6 @@
 /**
  * ConnectLib is the main class of the ConnectorAPI library for Standard API.
  * It provides methods to initialize the library with resource types, routes, and schemas,
- *
  * @author Sandro642
  * @version 1.0
  * @see ConnectLib#JobGetInfos()
@@ -34,16 +33,15 @@ public class ConnectLib {
     private static Logger logger = new Logger();
     private static StoreAndRetrieve storeAndRetrieve = new StoreAndRetrieve();
     private static YamlUtils yamlUtils = new YamlUtils();
-    private static final Map<String, String> routes = new HashMap<>();
+    private static final Map<String,String> routes = new HashMap<>();
     private static Logs logs = new Logs();
     private static LangManager langManager;
     private static RetrieveLastVersion rlv;
 
     /**
      * Init the ConnectLib with the specified resource type and routes.
-     *
      * @param resourceType the type of resource to initialize
-     * @param routes       the routes to be used in the ConnectLib
+     * @param routes the routes to be used in the ConnectLib
      */
     public void Init(ResourceType resourceType, LangType langType, Class<? extends Enum<?>>... routes) {
         try {
@@ -61,6 +59,8 @@ public void Init(ResourceType resourceType, LangType langType, Class<? extends E
 
             langManager = new LangManager();
 
+
+
             Map<Enum<?>, String> routesEnums = new HashMap<>();
             for (Class<? extends Enum<?>> route : routes) {
                 if (route == null) {
@@ -89,7 +89,6 @@ public void Init(ResourceType resourceType, LangType langType, Class<? extends E
 
     /**
      * Return the route associated with the given route name.
-     *
      * @param routeName the name of the route to retrieve
      * @return the route as a String
      */
@@ -104,7 +103,6 @@ public String getRoute(String routeName) {
 
     /**
      * Return an instance of JobGetInfos.
-     *
      * @return JobGetInfos instance
      */
     public JobGetInfos JobGetInfos() {
@@ -113,7 +111,6 @@ public JobGetInfos JobGetInfos() {
 
     /**
      * Return the instance of Logger.
-     *
      * @return Logger instance
      */
     public Logger Logger() {
@@ -125,7 +122,6 @@ public Logger Logger() {
 
     /**
      * Return the instance of StoreAndRetrieve.
-     *
      * @return StoreAndRetrieve instance
      */
     public StoreAndRetrieve StoreAndRetrieve() {
@@ -137,7 +133,6 @@ public StoreAndRetrieve StoreAndRetrieve() {
 
     /**
      * Return the instance of YamlUtils.
-     *
      * @return YamlUtils instance
      */
     public YamlUtils YamlUtils() {
@@ -149,7 +144,6 @@ public YamlUtils YamlUtils() {
 
     /**
      * Return the instance of Logs.
-     *
      * @return Logs instance
      */
     public MCSupport MCSupport() {
@@ -158,7 +152,6 @@ public MCSupport MCSupport() {
 
     /**
      * Return the instance of HookManager.
-     *
      * @return HookManager instance
      */
     public HookManager HookManager() {
@@ -167,7 +160,6 @@ public HookManager HookManager() {
 
     /**
      * Return the instance of LangSupport.
-     *
      * @return LangSupport instance
      */
     public LangSupport LangSupport() {
@@ -177,7 +169,6 @@ public LangSupport LangSupport() {
 
     /**
      * Return the instance of LangManager.
-     *
      * @return LangManager instance
      */
     public LangManager LangManager() {

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

@@ -24,7 +24,7 @@ public class ApiClient extends ApiFactory {
     /**
      * connectLib is an instance of ConnectLib that provides access to the library's configuration and utilities.
      */
-    private final ConnectLib connectLib = new ConnectLib();
+    private ConnectLib connectLib = new ConnectLib();
 
     /**
      * WebClient is a non-blocking, reactive HTTP client for making requests to the API.
@@ -63,15 +63,13 @@ public ApiClient(String baseUrlLambda) {
 
     /**
      * Method to call the API with a GET request.
-     *
      * @param routeName Name of the route to call.
      * @return a Mono that emits the ApiFactory response containing the parsed JSON data.
      */
     public Mono<ApiFactory> callAPIGet(String routeName) {
         connectLib.Logger().INFO(connectLib.LangManager().getMessage(CategoriesType.APICLIENT_CLASS, "call.get", Map.of("routename", routeName)));
 
-        record ResponseData(int statusCode, String body) {
-        }
+        record ResponseData(int statusCode, String body) {}
 
         return webClient.get()
                 .uri(routeName)
@@ -94,16 +92,14 @@ record ResponseData(int statusCode, String body) {
 
     /**
      * Method to call the API with a POST request.
-     *
      * @param routeName Name of the route to call.
-     * @param body      Body of the request (can be null for a request without body).
+     * @param body   Body of the request (can be null for a request without body).
      * @return a Mono that emits the ApiFactory response containing the parsed JSON data.
      */
     public Mono<ApiFactory> callAPIPost(String routeName, Map<String, Object> body) {
         connectLib.Logger().INFO(connectLib.LangManager().getMessage(CategoriesType.APICLIENT_CLASS, "call.post", Map.of("routename", routeName)));
 
-        record ResponseData(int statusCode, String body) {
-        }
+        record ResponseData(int statusCode, String body) {}
 
         return webClient.post()
                 .uri(routeName)
@@ -127,16 +123,14 @@ record ResponseData(int statusCode, String body) {
 
     /**
      * Method to call the API with a PUT request.
-     *
      * @param routeName Name of the route to call.
-     * @param body      Body of the request (can be null for a request without body).
+     * @param body  Body of the request (can be null for a request without body).
      * @return a Mono that emits the ApiFactory response containing the parsed JSON data.
      */
     public Mono<ApiFactory> callAPIPut(String routeName, Map<String, Object> body) {
         connectLib.Logger().INFO(connectLib.LangManager().getMessage(CategoriesType.APICLIENT_CLASS, "call.put", Map.of("routename", routeName)));
 
-        record ResponseData(int statusCode, String body) {
-        }
+        record ResponseData(int statusCode, String body) {}
 
         return webClient.put()
                 .uri(routeName)
@@ -160,16 +154,14 @@ record ResponseData(int statusCode, String body) {
 
     /**
      * Method to call the API with a PATCH request.
-     *
      * @param routeName Name of the route to call.
-     * @param body      Body of the request (can be null for a request without body).
+     * @param body Body of the request (can be null for a request without body).
      * @return a Mono that emits the ApiFactory response containing the parsed JSON data.
      */
     public Mono<ApiFactory> callAPIPatch(String routeName, Map<String, Object> body) {
         connectLib.Logger().INFO(connectLib.LangManager().getMessage(CategoriesType.APICLIENT_CLASS, "call.patch", Map.of("routename", routeName)));
 
-        record ResponseData(int statusCode, String body) {
-        }
+        record ResponseData(int statusCode, String body) {}
 
         return webClient.patch()
                 .uri(routeName)
@@ -193,15 +185,13 @@ record ResponseData(int statusCode, String body) {
 
     /**
      * Method to call the API with a DELETE request.
-     *
      * @param routeName Name of the route to call.
      * @return a Mono that emits the ApiFactory response containing the parsed JSON data.
      */
     public Mono<ApiFactory> callAPIDelete(String routeName) {
         connectLib.Logger().INFO(connectLib.LangManager().getMessage(CategoriesType.APICLIENT_CLASS, "call.delete", Map.of("routename", routeName)));
 
-        record ResponseData(int statusCode, String body) {
-        }
+        record ResponseData(int statusCode, String body) {}
 
         return webClient.delete()
                 .uri(routeName)

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

@@ -21,7 +21,7 @@ public class ApiFactory {
     /**
      * connectLib is an instance of ConnectLib that provides access to the library's configuration and utilities.
      */
-    private final ConnectLib connectLib = new ConnectLib();
+    private ConnectLib connectLib = new ConnectLib();
 
     /**
      * rawData is a Map that holds the parsed JSON data.
@@ -49,8 +49,7 @@ protected void parseFromRawJson(String rawJson) {
         this.rawJson = rawJson;
         try {
             ObjectMapper mapper = new ObjectMapper();
-            this.rawData = mapper.readValue(rawJson, new TypeReference<Map<String, Object>>() {
-            });
+            this.rawData = mapper.readValue(rawJson, new TypeReference<Map<String, Object>>() {});
         } catch (Exception e) {
             connectLib.Logger().ERROR(connectLib.LangManager().getMessage(CategoriesType.APIFACTORY_CLASS, "parsefromrawjson.error", Map.of("json", rawJson, "exception", e.getMessage())));
         }
@@ -100,7 +99,8 @@ public <O, K> Object getSpecData(O type, K value) {
             }
 
             Object nested = rawData.get(type.toString().toLowerCase());
-            if (nested instanceof Map<?, ?> nestedMap) {
+            if (nested instanceof Map) {
+                Map<?, ?> nestedMap = (Map<?, ?>) nested;
                 return nestedMap.get(value.toString().toLowerCase());
             }
         } catch (Exception e) {
@@ -136,11 +136,11 @@ public int getStatusCode() {
      */
     public Object display() {
         try {
-            if (rawData == null) {
-                connectLib.Logger().ERROR(connectLib.LangManager().getMessage(CategoriesType.APIFACTORY_CLASS, "general.mustbe"));
-                return null;
-            }
-            return rawData;
+        if (rawData == null) {
+            connectLib.Logger().ERROR(connectLib.LangManager().getMessage(CategoriesType.APIFACTORY_CLASS, "general.mustbe"));
+            return null;
+        }
+        return rawData;
         } catch (Exception e) {
             connectLib.Logger().ERROR(connectLib.LangManager().getMessage(CategoriesType.APIFACTORY_CLASS, "display.error", "exception", e.getMessage()));
         }

src/main/java/fr/sandro642/github/enums/LangType.java

@@ -23,7 +23,6 @@ public enum LangType {
 
     /**
      * Constructor to initialize the language code.
-     *
      * @param lang
      */
     LangType(String lang) {
@@ -32,7 +31,6 @@ public enum LangType {
 
     /**
      * Get the language code.
-     *
      * @return the language code string
      */
     public String getLang() {

src/main/java/fr/sandro642/github/enums/lang/CategoriesType.java

@@ -30,7 +30,6 @@ public enum CategoriesType {
 
     /**
      * Constructor to initialize the category.
-     *
      * @param category
      */
     CategoriesType(String category) {
@@ -39,7 +38,6 @@ public enum CategoriesType {
 
     /**
      * Get the category.
-     *
      * @return the category string
      */
     public String getCategory() {

src/main/java/fr/sandro642/github/example/ExampleUsages.java

@@ -7,6 +7,7 @@
 import fr.sandro642.github.enums.ResourceType;
 import fr.sandro642.github.enums.VersionType;
 import fr.sandro642.github.jobs.RouteImport;
+import fr.sandro642.github.misc.EnumLoader;
 
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -23,7 +24,7 @@
 
 public class ExampleUsages {
 
-    private final ConnectLib connectLib = new ConnectLib();
+    private ConnectLib connectLib = new ConnectLib();
 
     public enum ExampleRoutes implements RouteImport {
         EXAMPLE_ROUTE("/api/example/route");
@@ -92,7 +93,7 @@ public void exampleMethodAsync() {
     // Example to use all methods in JobGetInfos
     public void exampleJobGetInfos() {
         Map<String, ?> body = Map.of();
-        Map<String, ?> params = Map.of();
+        Map<String,?> params = Map.of();
         Map<String, ?> query = Map.of();
 
         connectLib.JobGetInfos().getRoutes(VersionType.V1_BRANCH, MethodType.GET, ExampleRoutes.EXAMPLE_ROUTE, body, params, query);

src/main/java/fr/sandro642/github/hook/HookManager.java

@@ -3,15 +3,15 @@
 import fr.sandro642.github.ConnectLib;
 import fr.sandro642.github.enums.ResourceType;
 import fr.sandro642.github.enums.lang.CategoriesType;
+import fr.sandro642.github.misc.Logger;
 
 /**
  * HookManager is a class that manages hooks for different resource types.
  * It allows for the initialization and management of hooks based on the specified resource type.
- *
- * @author Sandro642
- * @version 1.0
  * @see HookManager#BASE_PATH()
  * @see HookManager#FILE_LOCATION_KEY()
+ * @author Sandro642
+ * @version 1.0
  */
 
 public class HookManager {
@@ -26,7 +26,7 @@ public class HookManager {
      * connectLib is an instance of ConnectLib that provides access to the library's configuration and utilities.
      * It is used throughout the HookManager class to log messages and access other functionalities.
      */
-    private final ConnectLib connectLib = new ConnectLib();
+    private ConnectLib connectLib = new ConnectLib();
 
     /**
      * Initializes the HookManager with the specified resource type.
@@ -43,8 +43,8 @@ public class HookManager {
      * @return the initialized resource type
      */
     public ResourceType initHook(ResourceType resourceType) {
-        HookManager.resourceType = resourceType;
-        return HookManager.resourceType;
+        this.resourceType = resourceType;
+        return this.resourceType;
     }
 
     /**
@@ -55,7 +55,7 @@ public ResourceType initHook(ResourceType resourceType) {
     public void FILE_LOCATION_KEY() {
         switch (resourceType) {
             case MC_RESOURCES:
-                connectLib.StoreAndRetrieve().store.put(connectLib.StoreAndRetrieve().FILE_LOCATION_KEY, connectLib.MCSupport().getPluginPath());
+               connectLib.StoreAndRetrieve().store.put(connectLib.StoreAndRetrieve().FILE_LOCATION_KEY, connectLib.MCSupport().getPluginPath());
                 break;
             case MAIN_RESOURCES, TEST_RESOURCES:
                 connectLib.StoreAndRetrieve().store.put(connectLib.StoreAndRetrieve().FILE_LOCATION_KEY, resourceType.getPath());