From 01e18d00db15085a3d3d32ff44c798e96aa0f764 Mon Sep 17 00:00:00 2001 From: Connor Schweighoefer Date: Sat, 18 May 2024 15:02:55 +0200 Subject: [PATCH 1/2] Move `HttpClient` and improve switch statement --- .../api/DiscordRequestDispatcher.java | 30 +++++++------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestDispatcher.java b/api/src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestDispatcher.java index ff714f1a..da002eab 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestDispatcher.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestDispatcher.java @@ -19,6 +19,7 @@ public class DiscordRequestDispatcher implements Runnable { : "https://discord.com/api"; private static final Logger LOGGER = LogManager.getLogger(); + private final HttpClient httpClient; private final BlockingQueue queue; private final String botToken; private int numberOfRequestsSent; @@ -26,6 +27,7 @@ public class DiscordRequestDispatcher implements Runnable { public DiscordRequestDispatcher(String botToken) { this.botToken = botToken; + this.httpClient = HttpClient.newBuilder().build(); this.queue = new LinkedBlockingQueue<>(); this.numberOfRequestsSent = 0; this.timeSinceLastRequest = 0; @@ -61,7 +63,7 @@ public void run() { } private void sendRequest(DiscordRequestBuilder discordRequestBuilder) { - try (HttpClient httpClient = HttpClient.newBuilder().build()) { + try { HttpRequest.Builder requestBuilder = HttpRequest.newBuilder() .uri( @@ -83,24 +85,14 @@ private void sendRequest(DiscordRequestBuilder discordRequestBuilder) { } switch (discordRequestBuilder.getMethod()) { - case HttpMethod.GET: - requestBuilder.GET(); - break; - case HttpMethod.POST: - requestBuilder.POST(discordRequestBuilder.getBody()); - break; - case HttpMethod.DELETE: - requestBuilder.DELETE(); - break; - case HttpMethod.PUT: - requestBuilder.PUT(discordRequestBuilder.getBody()); - break; - case HttpMethod.PATCH: - requestBuilder.method(HttpMethod.PATCH.name(), discordRequestBuilder.getBody()); - break; - default: - throw new IllegalArgumentException( - "Unsupported HTTP method: " + discordRequestBuilder.getMethod()); + case HttpMethod.GET -> requestBuilder.GET(); + case HttpMethod.POST -> requestBuilder.POST(discordRequestBuilder.getBody()); + case HttpMethod.DELETE -> requestBuilder.DELETE(); + case HttpMethod.PUT -> requestBuilder.PUT(discordRequestBuilder.getBody()); + case HttpMethod.PATCH -> + requestBuilder.method(HttpMethod.PATCH.name(), discordRequestBuilder.getBody()); + default -> throw new IllegalArgumentException( + "Unsupported HTTP method: " + discordRequestBuilder.getMethod()); } HttpRequest httpRequest = requestBuilder.build(); From f03b213c083a748b50b32831f4997e0504c502bf Mon Sep 17 00:00:00 2001 From: Connor Schweighoefer Date: Sat, 18 May 2024 15:10:33 +0200 Subject: [PATCH 2/2] fix spotless --- .../jdi/internal/api/DiscordRequestDispatcher.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestDispatcher.java b/api/src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestDispatcher.java index da002eab..3dc048b7 100644 --- a/api/src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestDispatcher.java +++ b/api/src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestDispatcher.java @@ -90,9 +90,11 @@ private void sendRequest(DiscordRequestBuilder discordRequestBuilder) { case HttpMethod.DELETE -> requestBuilder.DELETE(); case HttpMethod.PUT -> requestBuilder.PUT(discordRequestBuilder.getBody()); case HttpMethod.PATCH -> - requestBuilder.method(HttpMethod.PATCH.name(), discordRequestBuilder.getBody()); - default -> throw new IllegalArgumentException( - "Unsupported HTTP method: " + discordRequestBuilder.getMethod()); + requestBuilder.method( + HttpMethod.PATCH.name(), discordRequestBuilder.getBody()); + default -> + throw new IllegalArgumentException( + "Unsupported HTTP method: " + discordRequestBuilder.getMethod()); } HttpRequest httpRequest = requestBuilder.build();