From 17d2b7c7f5ccb8cccd1c06be108bc30f2d25393f Mon Sep 17 00:00:00 2001 From: github-actions <> Date: Wed, 31 Jan 2024 04:41:12 +0000 Subject: [PATCH] Google Java Format --- .../at4j/core/ratelimit/RateLimitBucket.java | 1 + .../at4j/core/ratelimit/RateLimitManager.java | 8 +- .../core/ratelimit/RateLimitManagerTest.java | 120 +++++++++--------- 3 files changed, 66 insertions(+), 63 deletions(-) diff --git a/src/main/java/io/github/brenoepics/at4j/core/ratelimit/RateLimitBucket.java b/src/main/java/io/github/brenoepics/at4j/core/ratelimit/RateLimitBucket.java index 10974fc..91d0436 100644 --- a/src/main/java/io/github/brenoepics/at4j/core/ratelimit/RateLimitBucket.java +++ b/src/main/java/io/github/brenoepics/at4j/core/ratelimit/RateLimitBucket.java @@ -83,6 +83,7 @@ public int getTimeTillSpaceGetsAvailable() { /** * Gets the remaining RateLimit + * * @return int the remaining RateLimit */ public int getRateLimitRemaining() { diff --git a/src/main/java/io/github/brenoepics/at4j/core/ratelimit/RateLimitManager.java b/src/main/java/io/github/brenoepics/at4j/core/ratelimit/RateLimitManager.java index e29dde9..1297ec9 100644 --- a/src/main/java/io/github/brenoepics/at4j/core/ratelimit/RateLimitManager.java +++ b/src/main/java/io/github/brenoepics/at4j/core/ratelimit/RateLimitManager.java @@ -238,10 +238,10 @@ private RateLimitBucket getMatchingBucket(RestRequest request) { * @param responseTimestamp The timestamp directly after the response finished. */ void handleResponse( - RestRequest request, - RestRequestResult result, - RateLimitBucket bucket, - long responseTimestamp) { + RestRequest request, + RestRequestResult result, + RateLimitBucket bucket, + long responseTimestamp) { try { HttpResponse response = result.getResponse(); diff --git a/src/test/java/io/github/brenoepics/at4j/core/ratelimit/RateLimitManagerTest.java b/src/test/java/io/github/brenoepics/at4j/core/ratelimit/RateLimitManagerTest.java index 328f372..156f595 100644 --- a/src/test/java/io/github/brenoepics/at4j/core/ratelimit/RateLimitManagerTest.java +++ b/src/test/java/io/github/brenoepics/at4j/core/ratelimit/RateLimitManagerTest.java @@ -17,69 +17,71 @@ import org.junit.jupiter.api.Test; class RateLimitManagerTest { - private AzureApiImpl api; - private RestRequest request; - private RateLimitManager rateLimitManager; + private AzureApiImpl api; + private RestRequest request; + private RateLimitManager rateLimitManager; - @BeforeEach - public void setUp() { - api = mock(AzureApiImpl.class, RETURNS_DEEP_STUBS); - request = mock(RestRequest.class); - rateLimitManager = new RateLimitManager<>(api); - } + @BeforeEach + public void setUp() { + api = mock(AzureApiImpl.class, RETURNS_DEEP_STUBS); + request = mock(RestRequest.class); + rateLimitManager = new RateLimitManager<>(api); + } - @Test - void testQueueRequest() { - when(request.getEndpoint()).thenReturn(RestEndpoint.LANGUAGES); - rateLimitManager.queueRequest(request); - verify(api.getThreadPool().getExecutorService()).submit(any(Runnable.class)); - } + @Test + void testQueueRequest() { + when(request.getEndpoint()).thenReturn(RestEndpoint.LANGUAGES); + rateLimitManager.queueRequest(request); + verify(api.getThreadPool().getExecutorService()).submit(any(Runnable.class)); + } - @Test - void testSearchBucket() { - when(request.getEndpoint()).thenReturn(RestEndpoint.LANGUAGES); - Optional> bucket = rateLimitManager.searchBucket(request); - assertTrue(bucket.isPresent()); - } + @Test + void testSearchBucket() { + when(request.getEndpoint()).thenReturn(RestEndpoint.LANGUAGES); + Optional> bucket = rateLimitManager.searchBucket(request); + assertTrue(bucket.isPresent()); + } - @Test - void testWaitUntilSpaceGetsAvailable() { - RateLimitBucket bucket = new RateLimitBucket<>(RestEndpoint.LANGUAGES); - bucket.setRateLimitRemaining(1000); - bucket.setRateLimitResetTimestamp(System.currentTimeMillis() + 1000); - assertDoesNotThrow(() -> rateLimitManager.waitUntilSpaceGetsAvailable(bucket)); - } + @Test + void testWaitUntilSpaceGetsAvailable() { + RateLimitBucket bucket = new RateLimitBucket<>(RestEndpoint.LANGUAGES); + bucket.setRateLimitRemaining(1000); + bucket.setRateLimitResetTimestamp(System.currentTimeMillis() + 1000); + assertDoesNotThrow(() -> rateLimitManager.waitUntilSpaceGetsAvailable(bucket)); + } - @Test - void testRetryRequest() { - when(request.getEndpoint()).thenReturn(RestEndpoint.LANGUAGES); - rateLimitManager.searchBucket(request); - RestRequest retriedRequest = rateLimitManager.retryRequest(new RateLimitBucket<>(RestEndpoint.LANGUAGES )); - assertNull(retriedRequest); - } + @Test + void testRetryRequest() { + when(request.getEndpoint()).thenReturn(RestEndpoint.LANGUAGES); + rateLimitManager.searchBucket(request); + RestRequest retriedRequest = + rateLimitManager.retryRequest(new RateLimitBucket<>(RestEndpoint.LANGUAGES)); + assertNull(retriedRequest); + } - @Test - void retryRequestWhenBucketIsEmpty() { - when(request.getEndpoint()).thenReturn(RestEndpoint.LANGUAGES); - rateLimitManager.searchBucket(request); - RestRequest retriedRequest = rateLimitManager.retryRequest(new RateLimitBucket<>(RestEndpoint.LANGUAGES)); - assertNull(retriedRequest); - } + @Test + void retryRequestWhenBucketIsEmpty() { + when(request.getEndpoint()).thenReturn(RestEndpoint.LANGUAGES); + rateLimitManager.searchBucket(request); + RestRequest retriedRequest = + rateLimitManager.retryRequest(new RateLimitBucket<>(RestEndpoint.LANGUAGES)); + assertNull(retriedRequest); + } - @Test - void handleResponseWhenStatusCodeIsNot429() { - HttpHeaders headers = mock(HttpHeaders.class); - when(headers.firstValue(RateLimitManager.RATE_LIMITED_HEADER)).thenReturn(Optional.of("1")); - when(headers.firstValue(RateLimitManager.RATE_LIMIT_RESET_HEADER)).thenReturn(Optional.of("0")); - RateLimitBucket bucket = new RateLimitBucket<>(RestEndpoint.LANGUAGES); - RestRequestResult result = mock(RestRequestResult.class); - when(result.getResponse()).thenReturn(mock(HttpResponse.class)); - when(result.getResponse().statusCode()).thenReturn(200); - when(result.getResponse().headers()).thenReturn(headers); - CompletableFuture> future = new CompletableFuture<>(); - future.complete(result); - when(request.getResult()).thenReturn(future); - rateLimitManager.handleResponse(request, result, bucket, System.currentTimeMillis()); - assertEquals(1, bucket.getRateLimitRemaining()); - } -} \ No newline at end of file + @Test + void handleResponseWhenStatusCodeIsNot429() { + HttpHeaders headers = mock(HttpHeaders.class); + when(headers.firstValue(RateLimitManager.RATE_LIMITED_HEADER)).thenReturn(Optional.of("1")); + when(headers.firstValue(RateLimitManager.RATE_LIMIT_RESET_HEADER)).thenReturn(Optional.of("0")); + RateLimitBucket bucket = new RateLimitBucket<>(RestEndpoint.LANGUAGES); + RestRequestResult result = mock(RestRequestResult.class); + when(result.getResponse()).thenReturn(mock(HttpResponse.class)); + when(result.getResponse().statusCode()).thenReturn(200); + when(result.getResponse().headers()).thenReturn(headers); + CompletableFuture> future = new CompletableFuture<>(); + future.complete(result); + when(request.getResult()).thenReturn(future); + rateLimitManager.handleResponse(request, result, bucket, System.currentTimeMillis()); + assertEquals(1, bucket.getRateLimitRemaining()); + } +}