Information configuration

.gitignore

@@ -5,3 +5,4 @@
 target
 Example/target
 Website/javadocs
+hypixel-api-example/src/main/resources/config.properties

hypixel-api-core/src/main/java/net/hypixel/api/adapters/DateTimeTypeAdapter.java

@@ -1,6 +1,13 @@
 package net.hypixel.api.adapters;
 
-import com.google.gson.*;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
 import net.hypixel.api.util.Utilities;
 
 import java.lang.reflect.Type;

hypixel-api-core/src/main/java/net/hypixel/api/adapters/GameTypeTypeAdapter.java

@@ -1,6 +1,13 @@
 package net.hypixel.api.adapters;
 
-import com.google.gson.*;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
 import net.hypixel.api.data.type.GameType;
 
 import java.lang.reflect.Type;

hypixel-api-core/src/main/java/net/hypixel/api/adapters/ServerTypeTypeAdapter.java

@@ -1,6 +1,13 @@
 package net.hypixel.api.adapters;
 
-import com.google.gson.*;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
 import net.hypixel.api.data.type.GameType;
 import net.hypixel.api.data.type.ServerType;
 

hypixel-api-core/src/main/java/net/hypixel/api/adapters/UUIDTypeAdapter.java

@@ -1,6 +1,13 @@
 package net.hypixel.api.adapters;
 
-import com.google.gson.*;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
 import net.hypixel.api.util.Utilities;
 
 import java.lang.reflect.Type;

hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetRarityImpl.java

@@ -1,6 +1,7 @@
 package net.hypixel.api.pets.impl;
 
 import com.google.gson.JsonObject;
+
 import net.hypixel.api.pets.IPetRarity;
 
 public class PetRarityImpl implements IPetRarity {

hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetRepositoryImpl.java

@@ -3,6 +3,7 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+
 import net.hypixel.api.pets.IPetRarity;
 import net.hypixel.api.pets.IPetType;
 import net.hypixel.api.reply.ResourceReply;

hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetTypeImpl.java

@@ -1,6 +1,7 @@
 package net.hypixel.api.pets.impl;
 
 import com.google.gson.JsonObject;
+
 import net.hypixel.api.pets.IPetRarity;
 import net.hypixel.api.pets.IPetType;
 

hypixel-api-core/src/main/java/net/hypixel/api/util/Utilities.java

@@ -2,6 +2,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+
 import net.hypixel.api.adapters.*;
 import net.hypixel.api.data.type.GameType;
 import net.hypixel.api.data.type.ServerType;

hypixel-api-example/README.md

@@ -1,3 +1,7 @@
 # HypixelAPI Java Examples
 
-This codebase serves as examples for how to integrate the HypixelAPI into your project.
+This codebase serves as examples for how to integrate the HypixelAPI into your project.
+
+## Requirements
+
+Rename `config-config.properties` to `config.properties` and set your credentials.

hypixel-api-example/src/main/java/net/hypixel/api/config/ConfigManager.java

@@ -0,0 +1,35 @@
+package net.hypixel.api.config;
+
+import java.io.InputStream;
+import java.util.Properties;
+
+public class ConfigManager {
+
+    private static ConfigManager instance;
+
+    public static ConfigManager getInstance() {
+        if (instance == null) {
+            instance = new ConfigManager();
+        }
+
+        return instance;
+    }
+
+    private final Properties config = new Properties();
+
+    private ConfigManager() {
+        try {
+            String fileName = "config.properties";
+
+            InputStream input = ClassLoader.getSystemResourceAsStream(fileName);
+            config.load(input);
+
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public Properties getConfig() {
+        return config;
+    }
+}

hypixel-api-example/src/main/java/net/hypixel/api/example/ExampleUtil.java

@@ -2,20 +2,19 @@
 
 import net.hypixel.api.HypixelAPI;
 import net.hypixel.api.apache.ApacheHttpClient;
+import net.hypixel.api.config.ConfigManager;
 import net.hypixel.api.reply.AbstractReply;
 
+import java.util.Properties;
 import java.util.UUID;
 import java.util.function.BiConsumer;
 
 public class ExampleUtil {
 
-    private static String getApiKey() {
-        String apiKey = System.getenv("HYPIXEL_API_KEY");
-        if (apiKey != null) {
-            return apiKey;
-        }
+    private static final Properties config = ConfigManager.getInstance().getConfig();
 
-        return System.getProperty("apiKey", "64bd424e-ccb0-42ed-8b66-6e42a135afb4"); // arbitrary key, replace with your own to test or use the property
+    private static String getApiKey() {
+        return config.getProperty("HYPIXEL_API_KEY", "64bd424e-ccb0-42ed-8b66-6e42a135afb4");
     }
 
     public static final HypixelAPI API;
@@ -24,8 +23,8 @@ private static String getApiKey() {
         API = new HypixelAPI(new ApacheHttpClient(UUID.fromString(getApiKey())));
     }
 
-    public static final UUID HYPIXEL = UUID.fromString("f7c77d99-9f15-4a66-a87d-c4a51ef30d19");
-    public static final String GUILD_ID = "53bd67d7ed503e868873eceb";
+    public static final UUID HYPIXEL = UUID.fromString(config.getProperty("HYPIXEL", "f7c77d99-9f15-4a66-a87d-c4a51ef30d19"));
+    public static final String GUILD_ID = config.getProperty("GUILD_ID", "53bd67d7ed503e868873eceb");
 
     /**
      * Keep the program alive till we explicitly exit.

hypixel-api-example/src/main/resources/config-example.properties

@@ -0,0 +1,3 @@
+HYPIXEL_API_KEY=71eb4b26-73b4-4d5b-9952-b078d76543f4
+HYPIXEL=f7c77d99-9f15-4a66-a87d-c4a51ef30d19
+GUILD_ID=53bd67d7ed503e868873eceb

hypixel-api-transport-reactor/src/main/java/net/hypixel/api/reactor/ReactorHttpClient.java

@@ -15,7 +15,11 @@
 
 import java.time.Duration;
 import java.util.UUID;
-import java.util.concurrent.*;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;