Skip to content

Move HttpClient and improve switch statement #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 19, 2024
Merged

Move HttpClient and improve switch statement #102

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01e18d0
Move `HttpClient` and improve switch statement
SquidXTV May 18, 2024
f03b213
fix spotless
SquidXTV May 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 13 additions & 19 deletions api/src/main/java/com/javadiscord/jdi/internal/api/DiscordRequestDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@ public class DiscordRequestDispatcher implements Runnable {
: "https://discord.com/api";

private static final Logger LOGGER = LogManager.getLogger();
private final HttpClient httpClient;
private final BlockingQueue<DiscordRequestBuilder> queue;
private final String botToken;
private int numberOfRequestsSent;
private long timeSinceLastRequest;

public DiscordRequestDispatcher(String botToken) {
this.botToken = botToken;
this.httpClient = HttpClient.newBuilder().build();
this.queue = new LinkedBlockingQueue<>();
this.numberOfRequestsSent = 0;
this.timeSinceLastRequest = 0;
Expand Down Expand Up @@ -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(
Expand All @@ -83,24 +85,16 @@ 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();
Expand Down
Loading