From 3e8f7bea75543817922d23f129ff1dfa04bc4006 Mon Sep 17 00:00:00 2001 From: JustDrven Date: Fri, 28 Feb 2025 18:58:55 +0100 Subject: [PATCH 01/13] chore(git): added config.yaml into .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c1a7f5a1..701700aa 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ target Example/target Website/javadocs +hypixel-api-example/src/main/resources/config.yaml From e81a33970881ba9bad95c3292cd75ff5bee93f27 Mon Sep 17 00:00:00 2001 From: JustDrven Date: Fri, 28 Feb 2025 19:12:02 +0100 Subject: [PATCH 02/13] chore(git): added config.yaml into .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 701700aa..010ca706 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ target Example/target Website/javadocs -hypixel-api-example/src/main/resources/config.yaml +hypixel-api-example/src/main/resources/config.properties From 9fee6dccb1484e17a35defcf66d52199c89376ec Mon Sep 17 00:00:00 2001 From: JustDrven Date: Fri, 28 Feb 2025 19:25:00 +0100 Subject: [PATCH 03/13] feat(config): created config manager for easier configuration --- .../api/example/config/ConfigManager.java | 35 +++++++++++++++++++ .../main/resources/config-example.properties | 3 ++ 2 files changed, 38 insertions(+) create mode 100644 hypixel-api-example/src/main/java/net/hypixel/api/example/config/ConfigManager.java create mode 100644 hypixel-api-example/src/main/resources/config-example.properties diff --git a/hypixel-api-example/src/main/java/net/hypixel/api/example/config/ConfigManager.java b/hypixel-api-example/src/main/java/net/hypixel/api/example/config/ConfigManager.java new file mode 100644 index 00000000..b9096f1a --- /dev/null +++ b/hypixel-api-example/src/main/java/net/hypixel/api/example/config/ConfigManager.java @@ -0,0 +1,35 @@ +package net.hypixel.api.example.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; + } +} diff --git a/hypixel-api-example/src/main/resources/config-example.properties b/hypixel-api-example/src/main/resources/config-example.properties new file mode 100644 index 00000000..c038cd59 --- /dev/null +++ b/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 \ No newline at end of file From 3a7a63b5d0ff01b5474ca04fdf505a221568fa4b Mon Sep 17 00:00:00 2001 From: JustDrven Date: Fri, 28 Feb 2025 19:25:49 +0100 Subject: [PATCH 04/13] chore(config): applied config manager --- .../java/net/hypixel/api/example/ExampleUtil.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/hypixel-api-example/src/main/java/net/hypixel/api/example/ExampleUtil.java b/hypixel-api-example/src/main/java/net/hypixel/api/example/ExampleUtil.java index 6d63c7c6..87a693ba 100644 --- a/hypixel-api-example/src/main/java/net/hypixel/api/example/ExampleUtil.java +++ b/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.example.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. From 7f0ad58ad08c9a3b04dc1216e9da724e188ac935 Mon Sep 17 00:00:00 2001 From: JustDrven Date: Fri, 28 Feb 2025 19:28:58 +0100 Subject: [PATCH 05/13] chore(file): moved ConfigManager.java from "net.hypixel.api.example.config" to "net.hypixel.api.config" --- .../net/hypixel/api/{example => }/config/ConfigManager.java | 2 +- .../src/main/java/net/hypixel/api/example/ExampleUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename hypixel-api-example/src/main/java/net/hypixel/api/{example => }/config/ConfigManager.java (94%) diff --git a/hypixel-api-example/src/main/java/net/hypixel/api/example/config/ConfigManager.java b/hypixel-api-example/src/main/java/net/hypixel/api/config/ConfigManager.java similarity index 94% rename from hypixel-api-example/src/main/java/net/hypixel/api/example/config/ConfigManager.java rename to hypixel-api-example/src/main/java/net/hypixel/api/config/ConfigManager.java index b9096f1a..0f91c888 100644 --- a/hypixel-api-example/src/main/java/net/hypixel/api/example/config/ConfigManager.java +++ b/hypixel-api-example/src/main/java/net/hypixel/api/config/ConfigManager.java @@ -1,4 +1,4 @@ -package net.hypixel.api.example.config; +package net.hypixel.api.config; import java.io.InputStream; import java.util.Properties; diff --git a/hypixel-api-example/src/main/java/net/hypixel/api/example/ExampleUtil.java b/hypixel-api-example/src/main/java/net/hypixel/api/example/ExampleUtil.java index 87a693ba..438d90ac 100644 --- a/hypixel-api-example/src/main/java/net/hypixel/api/example/ExampleUtil.java +++ b/hypixel-api-example/src/main/java/net/hypixel/api/example/ExampleUtil.java @@ -2,7 +2,7 @@ import net.hypixel.api.HypixelAPI; import net.hypixel.api.apache.ApacheHttpClient; -import net.hypixel.api.example.config.ConfigManager; +import net.hypixel.api.config.ConfigManager; import net.hypixel.api.reply.AbstractReply; import java.util.Properties; From c07b9a1551d9133079d292d2e36fef69d86ee779 Mon Sep 17 00:00:00 2001 From: JustDrven Date: Fri, 28 Feb 2025 19:37:02 +0100 Subject: [PATCH 06/13] chore(docs): added tutorial to setup config --- hypixel-api-example/README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hypixel-api-example/README.md b/hypixel-api-example/README.md index 417f1b68..732bd244 100644 --- a/hypixel-api-example/README.md +++ b/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. \ No newline at end of file +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. \ No newline at end of file From 5ea2ef4128ec1f2e3c449e6796e4b0d283dd78a0 Mon Sep 17 00:00:00 2001 From: JustDrven Date: Fri, 28 Feb 2025 20:09:20 +0100 Subject: [PATCH 07/13] chore(java): improved imports --- .../net/hypixel/api/adapters/DateTimeTypeAdapter.java | 9 ++++++++- .../net/hypixel/api/adapters/GameTypeTypeAdapter.java | 9 ++++++++- .../net/hypixel/api/adapters/ServerTypeTypeAdapter.java | 9 ++++++++- .../java/net/hypixel/api/adapters/UUIDTypeAdapter.java | 9 ++++++++- .../java/net/hypixel/api/pets/impl/PetRarityImpl.java | 1 + .../net/hypixel/api/pets/impl/PetRepositoryImpl.java | 1 + .../main/java/net/hypixel/api/pets/impl/PetTypeImpl.java | 1 + .../src/main/java/net/hypixel/api/util/Utilities.java | 1 + .../java/net/hypixel/api/reactor/ReactorHttpClient.java | 6 +++++- 9 files changed, 41 insertions(+), 5 deletions(-) diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/DateTimeTypeAdapter.java b/hypixel-api-core/src/main/java/net/hypixel/api/adapters/DateTimeTypeAdapter.java index 849f636b..bffbb413 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/DateTimeTypeAdapter.java +++ b/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; diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/GameTypeTypeAdapter.java b/hypixel-api-core/src/main/java/net/hypixel/api/adapters/GameTypeTypeAdapter.java index 2ef87dd7..7547cf73 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/GameTypeTypeAdapter.java +++ b/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; diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/ServerTypeTypeAdapter.java b/hypixel-api-core/src/main/java/net/hypixel/api/adapters/ServerTypeTypeAdapter.java index ea89251e..80ee37d8 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/ServerTypeTypeAdapter.java +++ b/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; diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/UUIDTypeAdapter.java b/hypixel-api-core/src/main/java/net/hypixel/api/adapters/UUIDTypeAdapter.java index 609e49f5..21a8925b 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/UUIDTypeAdapter.java +++ b/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; diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetRarityImpl.java b/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetRarityImpl.java index d331dac5..57542e6e 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetRarityImpl.java +++ b/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 { diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetRepositoryImpl.java b/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetRepositoryImpl.java index 0f057150..52e60e32 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetRepositoryImpl.java +++ b/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; diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetTypeImpl.java b/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetTypeImpl.java index e7ff780f..78ba355a 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetTypeImpl.java +++ b/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; diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/util/Utilities.java b/hypixel-api-core/src/main/java/net/hypixel/api/util/Utilities.java index a6ec8d2c..cbc0f9b2 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/util/Utilities.java +++ b/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; diff --git a/hypixel-api-transport-reactor/src/main/java/net/hypixel/api/reactor/ReactorHttpClient.java b/hypixel-api-transport-reactor/src/main/java/net/hypixel/api/reactor/ReactorHttpClient.java index 40dbee9f..5e14d10f 100644 --- a/hypixel-api-transport-reactor/src/main/java/net/hypixel/api/reactor/ReactorHttpClient.java +++ b/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; From a2d127f1d727c8407a9d46075d594b81f86cfc2c Mon Sep 17 00:00:00 2001 From: JustDrven Date: Wed, 9 Apr 2025 23:19:18 +0200 Subject: [PATCH 08/13] feat(exceptions): created exception for missing values in config file --- .../api/config/exeption/ConfigValueNotFoundException.java | 7 +++++++ .../src/main/resources/config-example.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 hypixel-api-example/src/main/java/net/hypixel/api/config/exeption/ConfigValueNotFoundException.java diff --git a/hypixel-api-example/src/main/java/net/hypixel/api/config/exeption/ConfigValueNotFoundException.java b/hypixel-api-example/src/main/java/net/hypixel/api/config/exeption/ConfigValueNotFoundException.java new file mode 100644 index 00000000..7781169c --- /dev/null +++ b/hypixel-api-example/src/main/java/net/hypixel/api/config/exeption/ConfigValueNotFoundException.java @@ -0,0 +1,7 @@ +package net.hypixel.api.config.exeption; + +public class ConfigValueNotFoundException extends RuntimeException { + public ConfigValueNotFoundException(String key) { + super(key + " not found in config. Please check your config file"); + } +} diff --git a/hypixel-api-example/src/main/resources/config-example.properties b/hypixel-api-example/src/main/resources/config-example.properties index c038cd59..7046d2b1 100644 --- a/hypixel-api-example/src/main/resources/config-example.properties +++ b/hypixel-api-example/src/main/resources/config-example.properties @@ -1,3 +1,3 @@ HYPIXEL_API_KEY=71eb4b26-73b4-4d5b-9952-b078d76543f4 HYPIXEL=f7c77d99-9f15-4a66-a87d-c4a51ef30d19 -GUILD_ID=53bd67d7ed503e868873eceb \ No newline at end of file +GUILD_ID=53bd67d7ed503e868873eceb From a5ed3ec12e7581df7f22b2c2bcd8ad0c28953d7e Mon Sep 17 00:00:00 2001 From: JustDrven Date: Wed, 9 Apr 2025 23:20:05 +0200 Subject: [PATCH 09/13] chore(configs): improved getter for values in config & applied exception for missing values --- .../java/net/hypixel/api/config/ConfigManager.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/hypixel-api-example/src/main/java/net/hypixel/api/config/ConfigManager.java b/hypixel-api-example/src/main/java/net/hypixel/api/config/ConfigManager.java index 0f91c888..2aa23717 100644 --- a/hypixel-api-example/src/main/java/net/hypixel/api/config/ConfigManager.java +++ b/hypixel-api-example/src/main/java/net/hypixel/api/config/ConfigManager.java @@ -1,5 +1,7 @@ package net.hypixel.api.config; +import net.hypixel.api.config.exeption.ConfigValueNotFoundException; + import java.io.InputStream; import java.util.Properties; @@ -29,7 +31,13 @@ private ConfigManager() { } } - public Properties getConfig() { - return config; + public String get(String key) { + String value = config.getProperty(key); + if (value == null) { + throw new ConfigValueNotFoundException(key); + } + + return value; } + } From 6ded57126e01dbd5b8888a70c4fdcb747bcf8bb0 Mon Sep 17 00:00:00 2001 From: JustDrven Date: Wed, 9 Apr 2025 23:20:52 +0200 Subject: [PATCH 10/13] chore(configs): applied new config getter for config's values --- .../main/java/net/hypixel/api/example/ExampleUtil.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hypixel-api-example/src/main/java/net/hypixel/api/example/ExampleUtil.java b/hypixel-api-example/src/main/java/net/hypixel/api/example/ExampleUtil.java index 438d90ac..9c3377e0 100644 --- a/hypixel-api-example/src/main/java/net/hypixel/api/example/ExampleUtil.java +++ b/hypixel-api-example/src/main/java/net/hypixel/api/example/ExampleUtil.java @@ -5,16 +5,15 @@ 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 final Properties config = ConfigManager.getInstance().getConfig(); + private static final ConfigManager config = ConfigManager.getInstance(); private static String getApiKey() { - return config.getProperty("HYPIXEL_API_KEY", "64bd424e-ccb0-42ed-8b66-6e42a135afb4"); + return config.get("HYPIXEL_API_KEY"); } public static final HypixelAPI API; @@ -23,8 +22,8 @@ private static String getApiKey() { API = new HypixelAPI(new ApacheHttpClient(UUID.fromString(getApiKey()))); } - 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"); + public static final UUID HYPIXEL = UUID.fromString(config.get("HYPIXEL")); + public static final String GUILD_ID = config.get("GUILD_ID"); /** * Keep the program alive till we explicitly exit. From 2205a174bff3d14d4a27a17b2163b0573991d0ae Mon Sep 17 00:00:00 2001 From: JustDrven Date: Wed, 9 Apr 2025 23:24:53 +0200 Subject: [PATCH 11/13] chore(code style): added ending line --- hypixel-api-example/src/main/resources/config-example.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/hypixel-api-example/src/main/resources/config-example.properties b/hypixel-api-example/src/main/resources/config-example.properties index 7046d2b1..10f5775f 100644 --- a/hypixel-api-example/src/main/resources/config-example.properties +++ b/hypixel-api-example/src/main/resources/config-example.properties @@ -1,3 +1,4 @@ HYPIXEL_API_KEY=71eb4b26-73b4-4d5b-9952-b078d76543f4 HYPIXEL=f7c77d99-9f15-4a66-a87d-c4a51ef30d19 GUILD_ID=53bd67d7ed503e868873eceb + From 4198b0a02632ed112d7ceb522bce4a5bb053b637 Mon Sep 17 00:00:00 2001 From: JustDrven Date: Thu, 10 Apr 2025 00:17:14 +0200 Subject: [PATCH 12/13] feat(code style): added .editorconfig for remove non star imports --- .editorconfig | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..3ee30a88 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*.java] +ij_java_imports_layout = *,|,javax.**,java.**,|,$* + +ij_java_use_single_class_imports = true + +ij_java_class_count_to_use_import_on_demand = 999999999 +ij_java_names_count_to_use_import_on_demand = 999999999 From dbbb83d3db7a376f74c8bea50dacc1ee26ac65b0 Mon Sep 17 00:00:00 2001 From: JustDrven Date: Thu, 10 Apr 2025 00:19:32 +0200 Subject: [PATCH 13/13] chore(code style): removed non stars imports --- .../main/java/net/hypixel/api/HypixelAPI.java | 18 +++- .../api/adapters/DateTimeTypeAdapter.java | 1 - .../api/adapters/GameTypeTypeAdapter.java | 1 - .../api/adapters/ServerTypeTypeAdapter.java | 1 - .../hypixel/api/adapters/UUIDTypeAdapter.java | 1 - .../net/hypixel/api/data/type/ServerType.java | 8 +- .../net/hypixel/api/http/HTTPQueryParams.java | 8 +- .../net/hypixel/api/pets/IPetRepository.java | 2 +- .../java/net/hypixel/api/pets/PetStats.java | 2 +- .../java/net/hypixel/api/pets/PetType.java | 1 + .../hypixel/api/pets/impl/PetRarityImpl.java | 1 - .../api/pets/impl/PetRepositoryImpl.java | 1 - .../hypixel/api/pets/impl/PetTypeImpl.java | 1 - .../net/hypixel/api/reply/CountsReply.java | 16 ++-- .../net/hypixel/api/reply/GuildReply.java | 93 ++++++++++--------- .../net/hypixel/api/reply/ResourceReply.java | 1 - .../java/net/hypixel/api/util/Banner.java | 21 ++--- .../net/hypixel/api/util/PropertyFilter.java | 14 +-- .../java/net/hypixel/api/util/Utilities.java | 18 ++-- .../net/hypixel/api/config/ConfigManager.java | 17 ++-- .../net/hypixel/api/example/ExampleUtil.java | 14 ++- .../hypixel/api/example/GetGuildExample.java | 11 ++- .../example/TestAuthenticatedEndpoints.java | 7 +- hypixel-api-transport-apache/pom.xml | 4 +- hypixel-api-transport-reactor/pom.xml | 4 +- .../api/reactor/ReactorHttpClient.java | 10 +- hypixel-api-transport-unirest/pom.xml | 4 +- 27 files changed, 145 insertions(+), 135 deletions(-) diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/HypixelAPI.java b/hypixel-api-core/src/main/java/net/hypixel/api/HypixelAPI.java index 942cf1b9..98b14d4c 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/HypixelAPI.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/HypixelAPI.java @@ -9,8 +9,22 @@ import net.hypixel.api.http.HypixelHttpResponse; import net.hypixel.api.pets.IPetRepository; import net.hypixel.api.pets.impl.PetRepositoryImpl; -import net.hypixel.api.reply.*; -import net.hypixel.api.reply.skyblock.*; +import net.hypixel.api.reply.AbstractReply; +import net.hypixel.api.reply.BoostersReply; +import net.hypixel.api.reply.CountsReply; +import net.hypixel.api.reply.GuildReply; +import net.hypixel.api.reply.LeaderboardsReply; +import net.hypixel.api.reply.PlayerReply; +import net.hypixel.api.reply.PunishmentStatsReply; +import net.hypixel.api.reply.RateLimitedReply; +import net.hypixel.api.reply.RecentGamesReply; +import net.hypixel.api.reply.ResourceReply; +import net.hypixel.api.reply.StatusReply; +import net.hypixel.api.reply.skyblock.SkyBlockAuctionsReply; +import net.hypixel.api.reply.skyblock.SkyBlockBazaarReply; +import net.hypixel.api.reply.skyblock.SkyBlockNewsReply; +import net.hypixel.api.reply.skyblock.SkyBlockProfileReply; +import net.hypixel.api.reply.skyblock.SkyBlockProfilesReply; import net.hypixel.api.reply.skyblock.bingo.SkyBlockBingoDataReply; import net.hypixel.api.reply.skyblock.firesales.SkyBlockFireSalesReply; import net.hypixel.api.util.PropertyFilter; diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/DateTimeTypeAdapter.java b/hypixel-api-core/src/main/java/net/hypixel/api/adapters/DateTimeTypeAdapter.java index bffbb413..800a602d 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/DateTimeTypeAdapter.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/adapters/DateTimeTypeAdapter.java @@ -7,7 +7,6 @@ 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; diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/GameTypeTypeAdapter.java b/hypixel-api-core/src/main/java/net/hypixel/api/adapters/GameTypeTypeAdapter.java index 7547cf73..feaacb31 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/GameTypeTypeAdapter.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/adapters/GameTypeTypeAdapter.java @@ -7,7 +7,6 @@ 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; diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/ServerTypeTypeAdapter.java b/hypixel-api-core/src/main/java/net/hypixel/api/adapters/ServerTypeTypeAdapter.java index 80ee37d8..0de7c11c 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/ServerTypeTypeAdapter.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/adapters/ServerTypeTypeAdapter.java @@ -7,7 +7,6 @@ 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; diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/UUIDTypeAdapter.java b/hypixel-api-core/src/main/java/net/hypixel/api/adapters/UUIDTypeAdapter.java index 21a8925b..d396b1b4 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/adapters/UUIDTypeAdapter.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/adapters/UUIDTypeAdapter.java @@ -7,7 +7,6 @@ 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; diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/data/type/ServerType.java b/hypixel-api-core/src/main/java/net/hypixel/api/data/type/ServerType.java index aa73aa21..3c95e7f2 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/data/type/ServerType.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/data/type/ServerType.java @@ -2,10 +2,6 @@ public interface ServerType { - String name(); - - String getName(); - static ServerType valueOf(String value) { try { return GameType.valueOf(value); @@ -22,4 +18,8 @@ static ServerType valueOf(String value) { return null; } + String name(); + + String getName(); + } diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/http/HTTPQueryParams.java b/hypixel-api-core/src/main/java/net/hypixel/api/http/HTTPQueryParams.java index 3f64ad2e..46bc56e1 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/http/HTTPQueryParams.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/http/HTTPQueryParams.java @@ -5,16 +5,16 @@ public class HTTPQueryParams { - public static HTTPQueryParams create() { - return new HTTPQueryParams(); - } - private final Map params = new HashMap<>(); private HTTPQueryParams() { } + public static HTTPQueryParams create() { + return new HTTPQueryParams(); + } + public HTTPQueryParams add(String key, Object value) { this.params.put(key, value); return this; diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/pets/IPetRepository.java b/hypixel-api-core/src/main/java/net/hypixel/api/pets/IPetRepository.java index 4212204b..00c8b187 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/pets/IPetRepository.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/pets/IPetRepository.java @@ -46,7 +46,7 @@ public interface IPetRepository { /** * Gets if a player has unlocked the specified {@link IPetType} * - * @param type the pet type the player must have + * @param type the pet type the player must have * @param player the player to check against * @return {@code true} if the player has unlocked the pet, otherwise {@code false} */ diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/pets/PetStats.java b/hypixel-api-core/src/main/java/net/hypixel/api/pets/PetStats.java index 18bd43e3..1f6a21f6 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/pets/PetStats.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/pets/PetStats.java @@ -30,7 +30,7 @@ public PetStats(IPetRepository petRepository, Map> p * * Note: If this returns {@code null}, it doesn't mean that the player hasn't unlocked the pet. * What it does mean though, is that the player hasn't given any attributes nor a name to the pet - * + *

* To check if a player has unlocked a pet, use {@link IPetRepository#hasPlayerUnlocked(IPetType, PlayerReply.Player)} * * @param type the pet type to retrieve diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/pets/PetType.java b/hypixel-api-core/src/main/java/net/hypixel/api/pets/PetType.java index 8ceead24..ed4c87df 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/pets/PetType.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/pets/PetType.java @@ -4,6 +4,7 @@ /** * The old and deprecated enum for the pet types + * * @deprecated Consider using the {@link IPetRepository} */ @Deprecated diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetRarityImpl.java b/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetRarityImpl.java index 57542e6e..d331dac5 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetRarityImpl.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetRarityImpl.java @@ -1,7 +1,6 @@ package net.hypixel.api.pets.impl; import com.google.gson.JsonObject; - import net.hypixel.api.pets.IPetRarity; public class PetRarityImpl implements IPetRarity { diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetRepositoryImpl.java b/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetRepositoryImpl.java index 52e60e32..0f057150 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetRepositoryImpl.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetRepositoryImpl.java @@ -3,7 +3,6 @@ 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; diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetTypeImpl.java b/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetTypeImpl.java index 78ba355a..e7ff780f 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetTypeImpl.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/pets/impl/PetTypeImpl.java @@ -1,7 +1,6 @@ package net.hypixel.api.pets.impl; import com.google.gson.JsonObject; - import net.hypixel.api.pets.IPetRarity; import net.hypixel.api.pets.IPetType; diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/reply/CountsReply.java b/hypixel-api-core/src/main/java/net/hypixel/api/reply/CountsReply.java index 863a1314..8f0e0c7d 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/reply/CountsReply.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/reply/CountsReply.java @@ -14,6 +14,14 @@ public int getPlayerCount() { return playerCount; } + @Override + public String toString() { + return "GameCountsReply{" + + "games=" + games + + ", playerCount=" + playerCount + + "} " + super.toString(); + } + public static class GameCount { private Map modes; private int players; @@ -34,12 +42,4 @@ public String toString() { '}'; } } - - @Override - public String toString() { - return "GameCountsReply{" + - "games=" + games + - ", playerCount=" + playerCount + - "} " + super.toString(); - } } diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/reply/GuildReply.java b/hypixel-api-core/src/main/java/net/hypixel/api/reply/GuildReply.java index 05d554e1..81c5f4f7 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/reply/GuildReply.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/reply/GuildReply.java @@ -8,7 +8,12 @@ import java.time.LocalDate; import java.time.ZonedDateTime; -import java.util.*; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.UUID; // Suppressed because most fields are assigned by Gson via reflection. @SuppressWarnings({"unused", "RedundantSuppression", "MismatchedQueryAndUpdateOfCollection"}) @@ -23,8 +28,8 @@ public Guild getGuild() { @Override public String toString() { return "GuildReply{" + - "guild=" + guild + - "} " + super.toString(); + "guild=" + guild + + "} " + super.toString(); } public static class Guild { @@ -153,8 +158,8 @@ public Banner getBanner() { */ public List getMembers() { return members == null - ? Collections.emptyList() - : Collections.unmodifiableList(members); + ? Collections.emptyList() + : Collections.unmodifiableList(members); } /** @@ -174,8 +179,8 @@ public List getMembers() { */ public List getRanks() { return ranks == null - ? Collections.emptyList() - : Collections.unmodifiableList(ranks); + ? Collections.emptyList() + : Collections.unmodifiableList(ranks); } /** @@ -186,8 +191,8 @@ public List getRanks() { */ public List getPreferredGames() { return preferredGames == null - ? Collections.emptyList() - : Collections.unmodifiableList(preferredGames); + ? Collections.emptyList() + : Collections.unmodifiableList(preferredGames); } /** @@ -204,8 +209,8 @@ public long getExperienceForGame(GameType game) { } return Optional.ofNullable(guildExpByGameType) - .map(expByGame -> expByGame.get(game)) - .orElse(0L); + .map(expByGame -> expByGame.get(game)) + .orElse(0L); } /** @@ -221,8 +226,8 @@ public int getAchievementHighScore(GuildAchievement achievement) { throw new IllegalArgumentException("Cannot get high-score for null achievement"); } return Optional.ofNullable(achievements) - .map(highScores -> highScores.get(achievement)) - .orElse(0); + .map(highScores -> highScores.get(achievement)) + .orElse(0); } /** @@ -316,29 +321,29 @@ public int getCoinsEver() { */ public int getLegacyRanking() { return Optional.ofNullable(legacyRanking) - .map(ranking -> ranking + 1) - .orElse(-1); + .map(ranking -> ranking + 1) + .orElse(-1); } @Override public String toString() { return "Guild{" + - "id='" + id + '\'' + - ", name='" + name + '\'' + - ", description='" + description + '\'' + - ", creationDate=" + creationDate + - ", tag='" + tag + '\'' + - ", tagColor='" + tagColor + '\'' + - ", banner=" + banner + - ", members=" + members + - ", ranks=" + ranks + - ", experience=" + experience + - ", isPubliclyListed=" + isPubliclyListed + - ", isJoinable=" + isJoinable + - ", coins=" + coins + - ", coinsEver=" + coinsEver + - ", legacyRanking=" + legacyRanking + - '}'; + "id='" + id + '\'' + + ", name='" + name + '\'' + + ", description='" + description + '\'' + + ", creationDate=" + creationDate + + ", tag='" + tag + '\'' + + ", tagColor='" + tagColor + '\'' + + ", banner=" + banner + + ", members=" + members + + ", ranks=" + ranks + + ", experience=" + experience + + ", isPubliclyListed=" + isPubliclyListed + + ", isJoinable=" + isJoinable + + ", coins=" + coins + + ", coinsEver=" + coinsEver + + ", legacyRanking=" + legacyRanking + + '}'; } @Override @@ -414,8 +419,8 @@ public int getExperienceEarned(LocalDate date) { } return Optional.ofNullable(weeklyExperience) - .map(expByDate -> expByDate.get(date.toString())) - .orElse(-1); + .map(expByDate -> expByDate.get(date.toString())) + .orElse(-1); } /** @@ -429,10 +434,10 @@ public ZonedDateTime getJoined() { @Override public String toString() { return "Member{" + - "uuid=" + uuid + - ", rank='" + rank + '\'' + - ", joined=" + joinDate + - '}'; + "uuid=" + uuid + + ", rank='" + rank + '\'' + + ", joined=" + joinDate + + '}'; } @Override @@ -518,12 +523,12 @@ public int getPriority() { @Override public String toString() { return "Rank{" + - "name='" + name + '\'' + - ", tag='" + tag + '\'' + - ", isDefault=" + isDefault + - ", creationDate=" + creationDate + - ", priority=" + priority + - '}'; + "name='" + name + '\'' + + ", tag='" + tag + '\'' + + ", isDefault=" + isDefault + + ", creationDate=" + creationDate + + ", priority=" + priority + + '}'; } @Override @@ -536,7 +541,7 @@ public boolean equals(Object o) { } Rank rank = (Rank) o; return Objects.equals(name, rank.name) && - Objects.equals(creationDate, rank.creationDate); + Objects.equals(creationDate, rank.creationDate); } @Override diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/reply/ResourceReply.java b/hypixel-api-core/src/main/java/net/hypixel/api/reply/ResourceReply.java index b36cc509..fb2b73b3 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/reply/ResourceReply.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/reply/ResourceReply.java @@ -1,7 +1,6 @@ package net.hypixel.api.reply; import com.google.gson.JsonObject; -import net.hypixel.api.reply.AbstractReply; public class ResourceReply extends AbstractReply { diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/util/Banner.java b/hypixel-api-core/src/main/java/net/hypixel/api/util/Banner.java index f2c44324..a20c78d8 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/util/Banner.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/util/Banner.java @@ -1,6 +1,7 @@ package net.hypixel.api.util; import com.google.gson.annotations.SerializedName; + import java.util.Collections; import java.util.List; import java.util.Objects; @@ -70,17 +71,12 @@ public String getBase() { * @return an immutable list of the banner's layers. */ public List getPatterns() { - return patterns == null - ? Collections.emptyList() - : Collections.unmodifiableList(patterns); + return patterns == null ? Collections.emptyList() : Collections.unmodifiableList(patterns); } @Override public String toString() { - return "Banner{" + - "baseColor='" + baseColor + '\'' + - ", patterns=" + patterns + - '}'; + return "Banner{" + "baseColor='" + baseColor + '\'' + ", patterns=" + patterns + '}'; } @Override @@ -92,8 +88,7 @@ public boolean equals(Object o) { return false; } Banner banner = (Banner) o; - return Objects.equals(baseColor, banner.baseColor) && - Objects.equals(patterns, banner.patterns); + return Objects.equals(baseColor, banner.baseColor) && Objects.equals(patterns, banner.patterns); } @Override @@ -143,10 +138,7 @@ public String getColor() { @Override public String toString() { - return "Pattern{" + - "type='" + type + '\'' + - ", color='" + color + '\'' + - '}'; + return "Pattern{" + "type='" + type + '\'' + ", color='" + color + '\'' + '}'; } @Override @@ -158,8 +150,7 @@ public boolean equals(Object o) { return false; } Pattern pattern = (Pattern) o; - return Objects.equals(type, pattern.type) && - Objects.equals(color, pattern.color); + return Objects.equals(type, pattern.type) && Objects.equals(color, pattern.color); } @Override diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/util/PropertyFilter.java b/hypixel-api-core/src/main/java/net/hypixel/api/util/PropertyFilter.java index 6cb6f1e1..744230b1 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/util/PropertyFilter.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/util/PropertyFilter.java @@ -21,6 +21,13 @@ */ public class PropertyFilter { + // Only these keys are allowed in objects passed through. + protected final Set allowedKeys; + + public PropertyFilter() { + allowedKeys = new HashSet<>(); + } + /** * Shorthand for constructing a new filter that only allows the {@code includedKeys} to pass * through. See {@link #include(String...)} for the key syntax. @@ -31,13 +38,6 @@ public static PropertyFilter including(String... includedKeys) { return filter; } - // Only these keys are allowed in objects passed through. - protected final Set allowedKeys; - - public PropertyFilter() { - allowedKeys = new HashSet<>(); - } - /** * Allows properties with any of the provided {@code keys} to pass through the filter. To * include nested properties, use dots ({@code .}) to separate each parent property from its diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/util/Utilities.java b/hypixel-api-core/src/main/java/net/hypixel/api/util/Utilities.java index cbc0f9b2..1196cc08 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/util/Utilities.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/util/Utilities.java @@ -2,8 +2,12 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; - -import net.hypixel.api.adapters.*; +import net.hypixel.api.adapters.BoostersTypeAdapterFactory; +import net.hypixel.api.adapters.DateTimeTypeAdapter; +import net.hypixel.api.adapters.GameTypeTypeAdapter; +import net.hypixel.api.adapters.PlayerTypeAdapter; +import net.hypixel.api.adapters.ServerTypeTypeAdapter; +import net.hypixel.api.adapters.UUIDTypeAdapter; import net.hypixel.api.data.type.GameType; import net.hypixel.api.data.type.ServerType; import net.hypixel.api.reply.BoostersReply; @@ -17,7 +21,6 @@ public final class Utilities { - private static final Pattern TOKEN_SPLITTER = Pattern.compile("(?(BoostersReply.Booster.class)) .create(); + private static final Pattern TOKEN_SPLITTER = Pattern.compile("(? - hypixel-api diff --git a/hypixel-api-transport-reactor/pom.xml b/hypixel-api-transport-reactor/pom.xml index c327efd5..cee37493 100644 --- a/hypixel-api-transport-reactor/pom.xml +++ b/hypixel-api-transport-reactor/pom.xml @@ -1,6 +1,6 @@ - hypixel-api diff --git a/hypixel-api-transport-reactor/src/main/java/net/hypixel/api/reactor/ReactorHttpClient.java b/hypixel-api-transport-reactor/src/main/java/net/hypixel/api/reactor/ReactorHttpClient.java index 5e14d10f..b0bad0c4 100644 --- a/hypixel-api-transport-reactor/src/main/java/net/hypixel/api/reactor/ReactorHttpClient.java +++ b/hypixel-api-transport-reactor/src/main/java/net/hypixel/api/reactor/ReactorHttpClient.java @@ -91,6 +91,11 @@ public ReactorHttpClient(UUID apiKey) { this(apiKey, 8, 500); } + private static CompletableFuture toHypixelResponseFuture(Mono> result) { + return result.map(tuple -> new HypixelHttpResponse(tuple.getT2(), tuple.getT1(), tuple.getT3())) + .toFuture(); + } + /** * Canceling the returned future will result in canceling the sending of the request if still possible */ @@ -107,11 +112,6 @@ public CompletableFuture makeAuthenticatedRequest(String ur return toHypixelResponseFuture(makeRequest(url, true)); } - private static CompletableFuture toHypixelResponseFuture(Mono> result) { - return result.map(tuple -> new HypixelHttpResponse(tuple.getT2(), tuple.getT1(), tuple.getT3())) - .toFuture(); - } - @Override public void shutdown() { this.requestCallbackFluxDisposable.dispose(); diff --git a/hypixel-api-transport-unirest/pom.xml b/hypixel-api-transport-unirest/pom.xml index 02c1279c..675a76f6 100644 --- a/hypixel-api-transport-unirest/pom.xml +++ b/hypixel-api-transport-unirest/pom.xml @@ -1,6 +1,6 @@ - hypixel-api