From d4172d8a5ceb2add4fd55dfd09db0ce8545141b4 Mon Sep 17 00:00:00 2001 From: Craig Baker Date: Fri, 20 Oct 2017 22:06:01 +1100 Subject: [PATCH] Cont. migration to Junit5 style --- .../ratelimitj/core/RateLimitUtilsTest.java | 6 ++-- .../concurrent/ConcurrentLimitRuleTest.java | 10 +++--- .../limiter/request/RequestLimitRuleTest.java | 12 +++---- .../core/time/SystemTimeSupplierTest.java | 8 ++--- .../dropwizard/filter/AnyKeyTest.java | 36 ++++++++----------- .../filter/AuthenticatedKeyTest.java | 27 ++++++-------- .../dropwizard/filter/IpKeyTest.java | 32 +++++++---------- .../dropwizard/filter/ResourceKeyTest.java | 22 +++++------- ...zelcastRequestRateLimiterInternalTest.java | 10 +++--- ...idingWindowSyncRequestRateLimiterTest.java | 6 ++-- ...uestRequestRateLimiterPerformanceTest.java | 6 ++-- .../hazelcast/HazelcastTestFactory.java | 4 +-- .../InMemoryRateLimiterFactoryTest.java | 8 ++--- ...nMemoryRequestRateLimiterInternalTest.java | 8 ++--- .../request/RedisRateLimiterFactoryTest.java | 10 +++--- .../redis/request/RedisScriptLoaderTest.java | 12 +++---- ...dingWindowAsyncRequestRateLimiterTest.java | 6 ++-- ...gWindowReactiveRequestRateLimiterTest.java | 6 ++-- ...idingWindowSyncRequestRateLimiterTest.java | 6 ++-- ...uestRequestRateLimiterPerformanceTest.java | 6 ++-- .../RequestLimitRuleJsonSerialiserTest.java | 6 ++-- .../redis/time/RedisTimeSupplierTest.java | 12 +++---- .../AbstractAsyncRequestRateLimiterTest.java | 6 ++-- ...bstractReactiveRequestRateLimiterTest.java | 8 ++--- ...SyncRequestRateLimiterPerformanceTest.java | 2 +- .../AbstractSyncRequestRateLimiterTest.java | 10 +++--- 26 files changed, 132 insertions(+), 153 deletions(-) diff --git a/ratelimitj-core/src/test/java/es/moki/ratelimitj/core/RateLimitUtilsTest.java b/ratelimitj-core/src/test/java/es/moki/ratelimitj/core/RateLimitUtilsTest.java index f00fd10..fdef000 100644 --- a/ratelimitj-core/src/test/java/es/moki/ratelimitj/core/RateLimitUtilsTest.java +++ b/ratelimitj-core/src/test/java/es/moki/ratelimitj/core/RateLimitUtilsTest.java @@ -4,10 +4,10 @@ import static org.assertj.core.api.Assertions.assertThat; -public class RateLimitUtilsTest { +class RateLimitUtilsTest { @Test - public void shouldReturnFirst() { + void shouldReturnFirst() { Object one = new Object(); Object two = new Object(); @@ -15,7 +15,7 @@ public void shouldReturnFirst() { } @Test - public void shouldReturnSecond() { + void shouldReturnSecond() { Object one = null; Object two = new Object(); diff --git a/ratelimitj-core/src/test/java/es/moki/ratelimitj/core/limiter/concurrent/ConcurrentLimitRuleTest.java b/ratelimitj-core/src/test/java/es/moki/ratelimitj/core/limiter/concurrent/ConcurrentLimitRuleTest.java index 10ea551..512c153 100644 --- a/ratelimitj-core/src/test/java/es/moki/ratelimitj/core/limiter/concurrent/ConcurrentLimitRuleTest.java +++ b/ratelimitj-core/src/test/java/es/moki/ratelimitj/core/limiter/concurrent/ConcurrentLimitRuleTest.java @@ -7,31 +7,31 @@ import static org.assertj.core.api.Assertions.assertThat; -public class ConcurrentLimitRuleTest { +class ConcurrentLimitRuleTest { @Test - public void shouldHaveTimeout1Seconds() { + void shouldHaveTimeout1Seconds() { ConcurrentLimitRule limitRule = ConcurrentLimitRule.of(10, TimeUnit.SECONDS, 1); assertThat(limitRule.getTimeoutMillis()).isEqualTo(1000); } @Test - public void shouldHaveTimeout60Seconds() { + void shouldHaveTimeout60Seconds() { ConcurrentLimitRule limitRule = ConcurrentLimitRule.of(10, TimeUnit.MINUTES, 1); assertThat(limitRule.getTimeoutMillis()).isEqualTo(60000); } @Test - public void shouldHaveConcurrentLimit5() { + void shouldHaveConcurrentLimit5() { ConcurrentLimitRule limitRule = ConcurrentLimitRule.of(5, TimeUnit.MINUTES, 5); assertThat(limitRule.getConcurrentLimit()).isEqualTo(5); } @Test - public void shouldHaveNameOfBoom() { + void shouldHaveNameOfBoom() { ConcurrentLimitRule limitRule = ConcurrentLimitRule.of(1, TimeUnit.SECONDS, 5).withName("boom"); assertThat(limitRule.getName()).isEqualTo("boom"); diff --git a/ratelimitj-core/src/test/java/es/moki/ratelimitj/core/limiter/request/RequestLimitRuleTest.java b/ratelimitj-core/src/test/java/es/moki/ratelimitj/core/limiter/request/RequestLimitRuleTest.java index d45522c..f5a95f4 100644 --- a/ratelimitj-core/src/test/java/es/moki/ratelimitj/core/limiter/request/RequestLimitRuleTest.java +++ b/ratelimitj-core/src/test/java/es/moki/ratelimitj/core/limiter/request/RequestLimitRuleTest.java @@ -6,38 +6,38 @@ import static org.assertj.core.api.Assertions.assertThat; -public class RequestLimitRuleTest { +class RequestLimitRuleTest { @Test - public void shouldHaveDuration1Seconds() { + void shouldHaveDuration1Seconds() { RequestLimitRule requestLimitRule = RequestLimitRule.of(1, TimeUnit.SECONDS, 5); assertThat(requestLimitRule.getDurationSeconds()).isEqualTo(1); } @Test - public void shouldHaveDuration60Seconds() { + void shouldHaveDuration60Seconds() { RequestLimitRule requestLimitRule = RequestLimitRule.of(1, TimeUnit.MINUTES, 5); assertThat(requestLimitRule.getDurationSeconds()).isEqualTo(60); } @Test - public void shouldHaveLimit5() { + void shouldHaveLimit5() { RequestLimitRule requestLimitRule = RequestLimitRule.of(1, TimeUnit.MINUTES, 5); assertThat(requestLimitRule.getLimit()).isEqualTo(5); } @Test - public void shouldHavePrecisionOf10() { + void shouldHavePrecisionOf10() { RequestLimitRule requestLimitRule = RequestLimitRule.of(1, TimeUnit.SECONDS, 5).withPrecision(10); assertThat(requestLimitRule.getPrecision()).isPresent().hasValue(10); } @Test - public void shouldHaveNameOfBoom() { + void shouldHaveNameOfBoom() { RequestLimitRule requestLimitRule = RequestLimitRule.of(1, TimeUnit.SECONDS, 5).withName("boom"); assertThat(requestLimitRule.getName()).isEqualTo("boom"); diff --git a/ratelimitj-core/src/test/java/es/moki/ratelimitj/core/time/SystemTimeSupplierTest.java b/ratelimitj-core/src/test/java/es/moki/ratelimitj/core/time/SystemTimeSupplierTest.java index aca0fb2..b768e11 100644 --- a/ratelimitj-core/src/test/java/es/moki/ratelimitj/core/time/SystemTimeSupplierTest.java +++ b/ratelimitj-core/src/test/java/es/moki/ratelimitj/core/time/SystemTimeSupplierTest.java @@ -6,22 +6,22 @@ import static org.assertj.core.api.Assertions.assertThat; -public class SystemTimeSupplierTest { +class SystemTimeSupplierTest { @Test - public void shouldGetSystemCurrentTime() { + void shouldGetSystemCurrentTime() { Long time = new SystemTimeSupplier().get(); assertThat(time).isCloseTo(System.currentTimeMillis() / 1000L, Offset.offset(2L)); } @Test - public void shouldGetAsyncSystemCurrentTime() throws Exception { + void shouldGetAsyncSystemCurrentTime() throws Exception { Long time = new SystemTimeSupplier().getAsync().toCompletableFuture().get(); assertThat(time).isCloseTo(System.currentTimeMillis() / 1000L, Offset.offset(2L)); } @Test - public void shouldGetReactiveSystemCurrentTime() throws Exception { + void shouldGetReactiveSystemCurrentTime() throws Exception { Long time = new SystemTimeSupplier().getReactive().block(); assertThat(time).isCloseTo(System.currentTimeMillis() / 1000L, Offset.offset(2L)); } diff --git a/ratelimitj-dropwizard/src/test/java/es/moki/ratelimij/dropwizard/filter/AnyKeyTest.java b/ratelimitj-dropwizard/src/test/java/es/moki/ratelimij/dropwizard/filter/AnyKeyTest.java index b3b13e7..2457ba8 100644 --- a/ratelimitj-dropwizard/src/test/java/es/moki/ratelimij/dropwizard/filter/AnyKeyTest.java +++ b/ratelimitj-dropwizard/src/test/java/es/moki/ratelimij/dropwizard/filter/AnyKeyTest.java @@ -1,12 +1,9 @@ package es.moki.ratelimij.dropwizard.filter; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.container.ResourceInfo; @@ -15,29 +12,26 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) -public class AnyKeyTest { +class AnyKeyTest { - @Mock - private HttpServletRequest request; + private HttpServletRequest request = mock(HttpServletRequest.class); - @Mock - private ResourceInfo resource; + private ResourceInfo resource = mock(ResourceInfo.class); - @Mock - private SecurityContext securityContext; + private SecurityContext securityContext = mock(SecurityContext.class); - @Before - public void beforeEach() throws Exception { + @BeforeEach + void beforeEach() throws Exception { doReturn(Object.class).when(resource).getResourceClass(); when(resource.getResourceMethod()).thenReturn(Object.class.getMethod("wait")); } @DisplayName("ANY key should start with 'rlj' prefix") @Test - public void shouldStartWithPrefix() { + void shouldStartWithPrefix() { when(request.getRemoteAddr()).thenReturn("293.0.120.7"); Optional keyName = Key.ANY.create(request, resource, securityContext); @@ -47,7 +41,7 @@ public void shouldStartWithPrefix() { @DisplayName("ANY key should include Class and Method names in key") @Test - public void shouldIncludeResourceInKey() { + void shouldIncludeResourceInKey() { when(request.getRemoteAddr()).thenReturn("293.0.120.7"); Optional keyName = Key.ANY.create(request, resource, securityContext); @@ -57,7 +51,7 @@ public void shouldIncludeResourceInKey() { @DisplayName("ANY key should include user id if available") @Test - public void shouldIncludeUserId() { + void shouldIncludeUserId() { when(securityContext.getUserPrincipal()).thenReturn(() -> "elliot"); Optional keyName = Key.ANY.create(request, resource, securityContext); @@ -67,7 +61,7 @@ public void shouldIncludeUserId() { @DisplayName("ANY key should include X-Forwarded-For if available") @Test - public void shouldIncludeXForwardedForIfUserNull() { + void shouldIncludeXForwardedForIfUserNull() { when(request.getHeader("X-Forwarded-For")).thenReturn("293.0.113.7, 211.1.16.2"); Optional keyName = Key.ANY.create(request, resource, securityContext); @@ -77,7 +71,7 @@ public void shouldIncludeXForwardedForIfUserNull() { @DisplayName("ANY key should include remote IP if available and user and X-Forwarded-For not found") @Test - public void shouldIncludeRemoteIpIfUserAndXForwarded4Null() { + void shouldIncludeRemoteIpIfUserAndXForwarded4Null() { when(request.getRemoteAddr()).thenReturn("293.0.120.7"); Optional keyName = Key.ANY.create(request, resource, securityContext); @@ -87,7 +81,7 @@ public void shouldIncludeRemoteIpIfUserAndXForwarded4Null() { @DisplayName("ANY key should return absent if no key available") @Test - public void shouldBeAbsent() { + void shouldBeAbsent() { when(request.getRemoteAddr()).thenReturn(null); Optional keyName = Key.ANY.create(request, resource, securityContext); diff --git a/ratelimitj-dropwizard/src/test/java/es/moki/ratelimij/dropwizard/filter/AuthenticatedKeyTest.java b/ratelimitj-dropwizard/src/test/java/es/moki/ratelimij/dropwizard/filter/AuthenticatedKeyTest.java index c04db40..165c454 100644 --- a/ratelimitj-dropwizard/src/test/java/es/moki/ratelimij/dropwizard/filter/AuthenticatedKeyTest.java +++ b/ratelimitj-dropwizard/src/test/java/es/moki/ratelimij/dropwizard/filter/AuthenticatedKeyTest.java @@ -1,12 +1,9 @@ package es.moki.ratelimij.dropwizard.filter; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; import javax.ws.rs.container.ResourceInfo; import javax.ws.rs.core.SecurityContext; @@ -14,26 +11,24 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) -public class AuthenticatedKeyTest { +class AuthenticatedKeyTest { - @Mock - private ResourceInfo resource; + private ResourceInfo resource = mock(ResourceInfo.class); - @Mock - private SecurityContext securityContext; + private SecurityContext securityContext = mock(SecurityContext.class); - @Before - public void beforeEach() throws Exception { + @BeforeEach + void beforeEach() throws Exception { doReturn(Object.class).when(resource).getResourceClass(); when(resource.getResourceMethod()).thenReturn(Object.class.getMethod("wait")); } @DisplayName("AUTHENTICATED key should start with 'rlj' prefix") @Test - public void shouldStartWithPrefix() { + void shouldStartWithPrefix() { when(securityContext.getUserPrincipal()).thenReturn(() -> "elliot"); Optional keyName = Key.AUTHENTICATED.create(null, resource, securityContext); @@ -43,7 +38,7 @@ public void shouldStartWithPrefix() { @DisplayName("AUTHENTICATED key should include user id if available") @Test - public void shouldIncludeUserId() { + void shouldIncludeUserId() { when(securityContext.getUserPrincipal()).thenReturn(() -> "elliot"); Optional keyName = Key.AUTHENTICATED.create(null, resource, securityContext); @@ -53,7 +48,7 @@ public void shouldIncludeUserId() { @DisplayName("AUTHENTICATED key should return absent if no key available") @Test - public void shouldBeAbsent() { + void shouldBeAbsent() { Optional keyName = Key.AUTHENTICATED.create(null, resource, securityContext); assertThat(keyName).isNotPresent(); diff --git a/ratelimitj-dropwizard/src/test/java/es/moki/ratelimij/dropwizard/filter/IpKeyTest.java b/ratelimitj-dropwizard/src/test/java/es/moki/ratelimij/dropwizard/filter/IpKeyTest.java index ac592ce..e325726 100644 --- a/ratelimitj-dropwizard/src/test/java/es/moki/ratelimij/dropwizard/filter/IpKeyTest.java +++ b/ratelimitj-dropwizard/src/test/java/es/moki/ratelimij/dropwizard/filter/IpKeyTest.java @@ -1,12 +1,8 @@ package es.moki.ratelimij.dropwizard.filter; - -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.container.ResourceInfo; @@ -14,26 +10,24 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) -public class IpKeyTest { +class IpKeyTest { - @Mock - private HttpServletRequest request; + private HttpServletRequest request = mock(HttpServletRequest.class); - @Mock - private ResourceInfo resource; + private ResourceInfo resource = mock(ResourceInfo.class); - @Before - public void beforeEach() throws Exception { + @BeforeEach + void beforeEach() throws Exception { doReturn(Object.class).when(resource).getResourceClass(); when(resource.getResourceMethod()).thenReturn(Object.class.getMethod("wait")); } @DisplayName("IP key should start with 'rlj' prefix") @Test - public void shouldStartWithPrefix() { + void shouldStartWithPrefix() { when(request.getRemoteAddr()).thenReturn("293.0.120.7"); Optional keyName = Key.IP.create(request, resource, null); @@ -43,7 +37,7 @@ public void shouldStartWithPrefix() { @DisplayName("IP key should include Class and Method names in key") @Test - public void shouldIncludeResourceInKey() { + void shouldIncludeResourceInKey() { when(request.getRemoteAddr()).thenReturn("293.0.120.7"); Optional keyName = Key.IP.create(request, resource, null); @@ -53,7 +47,7 @@ public void shouldIncludeResourceInKey() { @DisplayName("IP key should include X-Forwarded-For if available") @Test - public void shouldIncludeXForwardedForIfUserNull() { + void shouldIncludeXForwardedForIfUserNull() { when(request.getHeader("X-Forwarded-For")).thenReturn("293.0.113.7, 211.1.16.2"); Optional keyName = Key.IP.create(request, resource, null); @@ -63,7 +57,7 @@ public void shouldIncludeXForwardedForIfUserNull() { @DisplayName("IP key should include remote IP if available and user and X-Forwarded-For not found") @Test - public void shouldIncludeRemoteIpIfUserAndXForwarded4Null() { + void shouldIncludeRemoteIpIfUserAndXForwarded4Null() { when(request.getRemoteAddr()).thenReturn("293.0.120.7"); Optional keyName = Key.IP.create(request, resource, null); @@ -73,7 +67,7 @@ public void shouldIncludeRemoteIpIfUserAndXForwarded4Null() { @DisplayName("IP key should return absent if no key available") @Test - public void shouldBeAbsent() { + void shouldBeAbsent() { when(request.getRemoteAddr()).thenReturn(null); Optional keyName = Key.IP.create(request, resource, null); diff --git a/ratelimitj-dropwizard/src/test/java/es/moki/ratelimij/dropwizard/filter/ResourceKeyTest.java b/ratelimitj-dropwizard/src/test/java/es/moki/ratelimij/dropwizard/filter/ResourceKeyTest.java index 3b8fa6b..786dfb5 100644 --- a/ratelimitj-dropwizard/src/test/java/es/moki/ratelimij/dropwizard/filter/ResourceKeyTest.java +++ b/ratelimitj-dropwizard/src/test/java/es/moki/ratelimij/dropwizard/filter/ResourceKeyTest.java @@ -1,35 +1,31 @@ package es.moki.ratelimij.dropwizard.filter; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; import javax.ws.rs.container.ResourceInfo; import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) -public class ResourceKeyTest { +class ResourceKeyTest { - @Mock - private ResourceInfo resource; + private ResourceInfo resource = mock(ResourceInfo.class); - @Before - public void beforeEach() throws Exception { + @BeforeEach + void beforeEach() throws Exception { doReturn(Object.class).when(resource).getResourceClass(); when(resource.getResourceMethod()).thenReturn(Object.class.getMethod("wait")); } @DisplayName("RESOURCE key should start with 'rlj' prefix") @Test - public void shouldStartWithPrefix() { + void shouldStartWithPrefix() { Optional keyName = Key.RESOURCE.create(null, resource, null); @@ -38,7 +34,7 @@ public void shouldStartWithPrefix() { @DisplayName("RESOURCE key should include Class and Method names in key") @Test - public void shouldIncludeResourceInKey() { + void shouldIncludeResourceInKey() { Optional keyName = Key.RESOURCE.create(null, resource, null); assertThat(keyName.get()).contains("java.lang.Object#wait"); diff --git a/ratelimitj-hazelcast/src/test/java/es/moki/ratelimitj/hazelcast/HazelcastRequestRateLimiterInternalTest.java b/ratelimitj-hazelcast/src/test/java/es/moki/ratelimitj/hazelcast/HazelcastRequestRateLimiterInternalTest.java index 253de67..6886c05 100644 --- a/ratelimitj-hazelcast/src/test/java/es/moki/ratelimitj/hazelcast/HazelcastRequestRateLimiterInternalTest.java +++ b/ratelimitj-hazelcast/src/test/java/es/moki/ratelimitj/hazelcast/HazelcastRequestRateLimiterInternalTest.java @@ -21,24 +21,24 @@ import static es.moki.ratelimitj.hazelcast.HazelcastTestFactory.newStandaloneHazelcastInstance; import static org.assertj.core.api.Assertions.assertThat; -public class HazelcastRequestRateLimiterInternalTest { +class HazelcastRequestRateLimiterInternalTest { private static HazelcastInstance hz; private final TimeBanditSupplier timeBandit = new TimeBanditSupplier(); @BeforeAll - public static void beforeAll() { + static void beforeAll() { hz = newStandaloneHazelcastInstance(); } @AfterAll - public static void afterAll() { + static void afterAll() { hz.shutdown(); } @AfterEach - public void afterEach() { + void afterEach() { hz.getDistributedObjects().forEach(DistributedObject::destroy); } @@ -47,7 +47,7 @@ private RequestRateLimiter getRateLimiter(Set rules, TimeSuppl } @Test - public void shouldEventuallyCleanUpExpiredKeys() throws Exception { + void shouldEventuallyCleanUpExpiredKeys() throws Exception { ImmutableSet rules = ImmutableSet.of(RequestLimitRule.of(2, TimeUnit.SECONDS, 5)); RequestRateLimiter requestRateLimiter = getRateLimiter(rules, timeBandit); diff --git a/ratelimitj-hazelcast/src/test/java/es/moki/ratelimitj/hazelcast/HazelcastSlidingWindowSyncRequestRateLimiterTest.java b/ratelimitj-hazelcast/src/test/java/es/moki/ratelimitj/hazelcast/HazelcastSlidingWindowSyncRequestRateLimiterTest.java index 5eab3be..342d729 100644 --- a/ratelimitj-hazelcast/src/test/java/es/moki/ratelimitj/hazelcast/HazelcastSlidingWindowSyncRequestRateLimiterTest.java +++ b/ratelimitj-hazelcast/src/test/java/es/moki/ratelimitj/hazelcast/HazelcastSlidingWindowSyncRequestRateLimiterTest.java @@ -20,17 +20,17 @@ public class HazelcastSlidingWindowSyncRequestRateLimiterTest extends AbstractSy private static HazelcastInstance hz; @BeforeAll - public static void beforeAll() { + static void beforeAll() { hz = newStandaloneHazelcastInstance(); } @AfterAll - public static void afterAll() { + static void afterAll() { hz.shutdown(); } @AfterEach - public void afterEach() { + void afterEach() { hz.getDistributedObjects().forEach(DistributedObject::destroy); } diff --git a/ratelimitj-hazelcast/src/test/java/es/moki/ratelimitj/hazelcast/HazelcastSlidingWindowSyncRequestRequestRateLimiterPerformanceTest.java b/ratelimitj-hazelcast/src/test/java/es/moki/ratelimitj/hazelcast/HazelcastSlidingWindowSyncRequestRequestRateLimiterPerformanceTest.java index 9027afc..d1ef870 100644 --- a/ratelimitj-hazelcast/src/test/java/es/moki/ratelimitj/hazelcast/HazelcastSlidingWindowSyncRequestRequestRateLimiterPerformanceTest.java +++ b/ratelimitj-hazelcast/src/test/java/es/moki/ratelimitj/hazelcast/HazelcastSlidingWindowSyncRequestRequestRateLimiterPerformanceTest.java @@ -20,17 +20,17 @@ public class HazelcastSlidingWindowSyncRequestRequestRateLimiterPerformanceTest private static HazelcastInstance hz; @BeforeAll - public static void beforeAll() { + static void beforeAll() { hz = newStandaloneHazelcastInstance(); } @AfterAll - public static void afterAll() { + static void afterAll() { hz.shutdown(); } @AfterEach - public void afterEach() { + void afterEach() { hz.getDistributedObjects().forEach(DistributedObject::destroy); } diff --git a/ratelimitj-hazelcast/src/test/java/es/moki/ratelimitj/hazelcast/HazelcastTestFactory.java b/ratelimitj-hazelcast/src/test/java/es/moki/ratelimitj/hazelcast/HazelcastTestFactory.java index 17902f6..9e6008c 100644 --- a/ratelimitj-hazelcast/src/test/java/es/moki/ratelimitj/hazelcast/HazelcastTestFactory.java +++ b/ratelimitj-hazelcast/src/test/java/es/moki/ratelimitj/hazelcast/HazelcastTestFactory.java @@ -5,9 +5,9 @@ import com.hazelcast.core.Hazelcast; import com.hazelcast.core.HazelcastInstance; -public class HazelcastTestFactory { +class HazelcastTestFactory { - public static HazelcastInstance newStandaloneHazelcastInstance() { + static HazelcastInstance newStandaloneHazelcastInstance() { Config config = new Config(); config.setProperty("hazelcast.logging.type", "slf4j"); config.setProperty("hazelcast.shutdownhook.enabled", "false"); diff --git a/ratelimitj-inmemory/src/test/java/es/moki/ratelimitj/inmemory/InMemoryRateLimiterFactoryTest.java b/ratelimitj-inmemory/src/test/java/es/moki/ratelimitj/inmemory/InMemoryRateLimiterFactoryTest.java index 30625a7..8f46685 100644 --- a/ratelimitj-inmemory/src/test/java/es/moki/ratelimitj/inmemory/InMemoryRateLimiterFactoryTest.java +++ b/ratelimitj-inmemory/src/test/java/es/moki/ratelimitj/inmemory/InMemoryRateLimiterFactoryTest.java @@ -10,12 +10,12 @@ import static org.assertj.core.api.Assertions.assertThat; -public class InMemoryRateLimiterFactoryTest { +class InMemoryRateLimiterFactoryTest { private InMemoryRateLimiterFactory factory = new InMemoryRateLimiterFactory(); @Test - public void shouldReturnTheSameInstanceForSameRules() { + void shouldReturnTheSameInstanceForSameRules() { RequestLimitRule rule1 = RequestLimitRule.of(1, TimeUnit.MINUTES, 10); RequestRateLimiter rateLimiter1 = factory.getInstance(ImmutableSet.of(rule1)); @@ -27,7 +27,7 @@ public void shouldReturnTheSameInstanceForSameRules() { } @Test - public void shouldReturnTheSameInstanceForSameSetOfRules() { + void shouldReturnTheSameInstanceForSameSetOfRules() { RequestLimitRule rule1a = RequestLimitRule.of(1, TimeUnit.MINUTES, 10); RequestLimitRule rule1b = RequestLimitRule.of(1, TimeUnit.HOURS, 100); @@ -41,7 +41,7 @@ public void shouldReturnTheSameInstanceForSameSetOfRules() { } @Test - public void shouldNotReturnTheSameInstanceForSameRules() { + void shouldNotReturnTheSameInstanceForSameRules() { RequestLimitRule rule1 = RequestLimitRule.of(1, TimeUnit.MINUTES, 22); RequestRateLimiter rateLimiter1 = factory.getInstance(ImmutableSet.of(rule1)); diff --git a/ratelimitj-inmemory/src/test/java/es/moki/ratelimitj/inmemory/request/InMemoryRequestRateLimiterInternalTest.java b/ratelimitj-inmemory/src/test/java/es/moki/ratelimitj/inmemory/request/InMemoryRequestRateLimiterInternalTest.java index f66cb3c..bbd27d5 100644 --- a/ratelimitj-inmemory/src/test/java/es/moki/ratelimitj/inmemory/request/InMemoryRequestRateLimiterInternalTest.java +++ b/ratelimitj-inmemory/src/test/java/es/moki/ratelimitj/inmemory/request/InMemoryRequestRateLimiterInternalTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; -public class InMemoryRequestRateLimiterInternalTest { +class InMemoryRequestRateLimiterInternalTest { private final TimeBanditSupplier timeBandit = new TimeBanditSupplier(); @@ -26,12 +26,12 @@ public class InMemoryRequestRateLimiterInternalTest { private final ExpiringMap expiryingKeyMap = ExpiringMap.builder().variableExpiration().build(); @BeforeAll - public static void before() { + static void before() { } @AfterAll - public static void after() { + static void after() { } @@ -41,7 +41,7 @@ private RequestRateLimiter getRateLimiter(Set rules, TimeSuppl @Test @Disabled - public void shouldEventuallyCleanUpExpiredKeys() throws Exception { + void shouldEventuallyCleanUpExpiredKeys() throws Exception { ImmutableSet rules = ImmutableSet.of(RequestLimitRule.of(1, TimeUnit.SECONDS, 5)); RequestRateLimiter requestRateLimiter = getRateLimiter(rules, timeBandit); diff --git a/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisRateLimiterFactoryTest.java b/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisRateLimiterFactoryTest.java index 3e3eb7c..33747f3 100644 --- a/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisRateLimiterFactoryTest.java +++ b/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisRateLimiterFactoryTest.java @@ -15,7 +15,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class RedisRateLimiterFactoryTest { +class RedisRateLimiterFactoryTest { private RedisClient client = mock(RedisClient.class); @@ -24,13 +24,13 @@ public class RedisRateLimiterFactoryTest { private RedisRateLimiterFactory factory; @BeforeEach - public void beforeEach() { + void beforeEach() { factory = new RedisRateLimiterFactory(client); when(client.connect()).thenReturn(connection); } @Test - public void shouldReturnTheSameInstanceForSameRules() { + void shouldReturnTheSameInstanceForSameRules() { RequestLimitRule rule1 = RequestLimitRule.of(1, TimeUnit.MINUTES, 10); RequestRateLimiter rateLimiter1 = factory.getInstance(ImmutableSet.of(rule1)); @@ -42,7 +42,7 @@ public void shouldReturnTheSameInstanceForSameRules() { } @Test - public void shouldReturnTheSameInstanceForSameSetOfRules() { + void shouldReturnTheSameInstanceForSameSetOfRules() { RequestLimitRule rule1a = RequestLimitRule.of(1, TimeUnit.MINUTES, 10); RequestLimitRule rule1b = RequestLimitRule.of(1, TimeUnit.HOURS, 100); @@ -56,7 +56,7 @@ public void shouldReturnTheSameInstanceForSameSetOfRules() { } @Test - public void shouldNotReturnTheSameInstanceForSameRules() { + void shouldNotReturnTheSameInstanceForSameRules() { RequestLimitRule rule1 = RequestLimitRule.of(1, TimeUnit.MINUTES, 22); RequestRateLimiter rateLimiter1 = factory.getInstance(ImmutableSet.of(rule1)); diff --git a/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisScriptLoaderTest.java b/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisScriptLoaderTest.java index b425257..6d76261 100644 --- a/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisScriptLoaderTest.java +++ b/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisScriptLoaderTest.java @@ -10,23 +10,23 @@ import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -public class RedisScriptLoaderTest { +class RedisScriptLoaderTest { private static RedisClient client; @BeforeAll - public static void beforeAll() { + static void beforeAll() { client = RedisClient.create("redis://localhost"); } @AfterAll - public static void afterAll() { + static void afterAll() { client.shutdownAsync(); } @Test @DisplayName("should load rate limit lua script into Redis") - public void shouldLoadScript() { + void shouldLoadScript() { RedisScriptLoader scriptLoader = new RedisScriptLoader(client.connect(), "sliding-window-ratelimit.lua"); assertThat(scriptLoader.scriptSha()).isNotEmpty(); @@ -34,7 +34,7 @@ public void shouldLoadScript() { @Test @DisplayName("should eagerly load rate limit lua script into Redis") - public void shouldEagerlyLoadScript() { + void shouldEagerlyLoadScript() { RedisScriptLoader scriptLoader = new RedisScriptLoader(client.connect(), "sliding-window-ratelimit.lua", true); assertThat(scriptLoader.scriptSha()).isNotEmpty(); @@ -42,7 +42,7 @@ public void shouldEagerlyLoadScript() { @Test @DisplayName("should fail if script not found") - public void shouldFailedIfScriptNotFound() { + void shouldFailedIfScriptNotFound() { Throwable exception = assertThrows(IllegalArgumentException.class, () -> { new RedisScriptLoader(client.connect(), "not-found-script.lua", true); diff --git a/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisSlidingWindowAsyncRequestRateLimiterTest.java b/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisSlidingWindowAsyncRequestRateLimiterTest.java index eae5117..98951d1 100644 --- a/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisSlidingWindowAsyncRequestRateLimiterTest.java +++ b/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisSlidingWindowAsyncRequestRateLimiterTest.java @@ -19,18 +19,18 @@ public class RedisSlidingWindowAsyncRequestRateLimiterTest extends AbstractAsync private static StatefulRedisConnection connect; @BeforeAll - public static void beforeAll() { + static void beforeAll() { client = RedisClient.create("redis://localhost"); connect = client.connect(); } @AfterAll - public static void afterAll() { + static void afterAll() { client.shutdownAsync(); } @AfterEach - public void afterEach() { + void afterEach() { try (StatefulRedisConnection connection = client.connect()) { connection.sync().flushdb(); } diff --git a/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisSlidingWindowReactiveRequestRateLimiterTest.java b/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisSlidingWindowReactiveRequestRateLimiterTest.java index 34cfbc4..9a0ac85 100644 --- a/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisSlidingWindowReactiveRequestRateLimiterTest.java +++ b/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisSlidingWindowReactiveRequestRateLimiterTest.java @@ -19,18 +19,18 @@ public class RedisSlidingWindowReactiveRequestRateLimiterTest extends AbstractRe private static StatefulRedisConnection connect; @BeforeAll - public static void beforeAll() { + static void beforeAll() { client = RedisClient.create("redis://localhost"); connect = client.connect(); } @AfterAll - public static void afterAll() { + static void afterAll() { client.shutdownAsync(); } @AfterEach - public void afterEach() { + void afterEach() { try (StatefulRedisConnection connection = client.connect()) { connection.sync().flushdb(); } diff --git a/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisSlidingWindowSyncRequestRateLimiterTest.java b/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisSlidingWindowSyncRequestRateLimiterTest.java index f593f41..5c5a654 100644 --- a/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisSlidingWindowSyncRequestRateLimiterTest.java +++ b/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisSlidingWindowSyncRequestRateLimiterTest.java @@ -20,18 +20,18 @@ public class RedisSlidingWindowSyncRequestRateLimiterTest extends AbstractSyncRe private static StatefulRedisConnection connect; @BeforeAll - public static void beforeAll() { + static void beforeAll() { client = RedisClient.create("redis://localhost"); connect = client.connect(); } @AfterAll - public static void afterAll() { + static void afterAll() { client.shutdownAsync(); } @AfterEach - public void afterEach() { + void afterEach() { try (StatefulRedisConnection connection = client.connect()) { connection.sync().flushdb(); } diff --git a/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisSlidingWindowSyncRequestRequestRateLimiterPerformanceTest.java b/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisSlidingWindowSyncRequestRequestRateLimiterPerformanceTest.java index dec6b4b..9ab23ed 100644 --- a/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisSlidingWindowSyncRequestRequestRateLimiterPerformanceTest.java +++ b/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RedisSlidingWindowSyncRequestRequestRateLimiterPerformanceTest.java @@ -19,18 +19,18 @@ public class RedisSlidingWindowSyncRequestRequestRateLimiterPerformanceTest exte private static StatefulRedisConnection connect; @BeforeAll - public static void beforeAll() { + static void beforeAll() { client = RedisClient.create("redis://localhost"); connect = client.connect(); } @AfterAll - public static void afterAll() { + static void afterAll() { client.shutdownAsync(); } @AfterEach - public void afterEach() { + void afterEach() { try (StatefulRedisConnection connection = client.connect()) { connection.sync().flushdb(); } diff --git a/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RequestLimitRuleJsonSerialiserTest.java b/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RequestLimitRuleJsonSerialiserTest.java index ba1b141..8b41076 100644 --- a/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RequestLimitRuleJsonSerialiserTest.java +++ b/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/request/RequestLimitRuleJsonSerialiserTest.java @@ -10,13 +10,13 @@ import static org.assertj.core.api.Assertions.assertThat; -public class RequestLimitRuleJsonSerialiserTest { +class RequestLimitRuleJsonSerialiserTest { private final LimitRuleJsonSerialiser serialiser = new LimitRuleJsonSerialiser(); @Test @DisplayName("should encode limit rule in JSON array") - public void shouldEncode() { + void shouldEncode() { ImmutableList rules = ImmutableList.of(RequestLimitRule.of(10, TimeUnit.SECONDS, 10L), RequestLimitRule.of(1, TimeUnit.MINUTES, 20L)); @@ -25,7 +25,7 @@ public void shouldEncode() { @Test @DisplayName("should encode limit rule with precision in JSON array") - public void shouldEncodeWithPrecisions() { + void shouldEncodeWithPrecisions() { ImmutableList rules = ImmutableList.of(RequestLimitRule.of(10, TimeUnit.SECONDS, 10L).withPrecision(4), RequestLimitRule.of(1, TimeUnit.MINUTES, 20L).withPrecision(8)); diff --git a/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/time/RedisTimeSupplierTest.java b/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/time/RedisTimeSupplierTest.java index 4d2a2d7..3ee194b 100644 --- a/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/time/RedisTimeSupplierTest.java +++ b/ratelimitj-redis/src/test/java/es/moki/ratelimitj/redis/time/RedisTimeSupplierTest.java @@ -8,36 +8,36 @@ import static org.assertj.core.api.Assertions.assertThat; -public class RedisTimeSupplierTest { +class RedisTimeSupplierTest { private static RedisClient client; private static StatefulRedisConnection connect; @BeforeAll - public static void beforeAll() { + static void beforeAll() { client = RedisClient.create("redis://localhost"); connect = client.connect(); } @AfterAll - public static void afterAll() { + static void afterAll() { client.shutdownAsync(); } @Test - public void shouldGetSystemCurrentTime() { + void shouldGetSystemCurrentTime() { Long time = new RedisTimeSupplier(connect).get(); assertThat(time).isNotNull().isNotNegative().isNotZero(); } @Test - public void shouldGetAsyncSystemCurrentTime() throws Exception { + void shouldGetAsyncSystemCurrentTime() throws Exception { Long time = new RedisTimeSupplier(connect).getAsync().toCompletableFuture().get(); assertThat(time).isNotNull().isNotNegative().isNotZero(); } @Test - public void shouldGetReactiveSystemCurrentTime() throws Exception { + void shouldGetReactiveSystemCurrentTime() throws Exception { Long time = new RedisTimeSupplier(connect).getReactive().block(); assertThat(time).isNotNull().isNotNegative().isNotZero(); } diff --git a/ratelimitj-test/src/main/java/es/moki/ratelimitj/test/limiter/request/AbstractAsyncRequestRateLimiterTest.java b/ratelimitj-test/src/main/java/es/moki/ratelimitj/test/limiter/request/AbstractAsyncRequestRateLimiterTest.java index 98ffd10..e92985e 100644 --- a/ratelimitj-test/src/main/java/es/moki/ratelimitj/test/limiter/request/AbstractAsyncRequestRateLimiterTest.java +++ b/ratelimitj-test/src/main/java/es/moki/ratelimitj/test/limiter/request/AbstractAsyncRequestRateLimiterTest.java @@ -28,7 +28,7 @@ public abstract class AbstractAsyncRequestRateLimiterTest { protected abstract AsyncRequestRateLimiter getAsyncRateLimiter(Set rule, TimeSupplier timeSupplier); @Test - public void shouldLimitSingleWindowAsync() throws Exception { + void shouldLimitSingleWindowAsync() throws Exception { ImmutableSet rules = ImmutableSet.of(RequestLimitRule.of(10, TimeUnit.SECONDS, 5)); AsyncRequestRateLimiter rateLimiter = getAsyncRateLimiter(rules, timeBandit); @@ -50,7 +50,7 @@ public void shouldLimitSingleWindowAsync() throws Exception { @Test - public void shouldLimitDualWindowAsync() throws Exception { + void shouldLimitDualWindowAsync() throws Exception { ImmutableSet rules = ImmutableSet.of(RequestLimitRule.of(2, TimeUnit.SECONDS, 5), RequestLimitRule.of(10, TimeUnit.SECONDS, 20)); AsyncRequestRateLimiter rateLimiter = getAsyncRateLimiter(rules, timeBandit); @@ -74,7 +74,7 @@ public void shouldLimitDualWindowAsync() throws Exception { } @Test - public void shouldResetLimit() throws Exception { + void shouldResetLimit() throws Exception { ImmutableSet rules = ImmutableSet.of(RequestLimitRule.of(60, TimeUnit.SECONDS, 1)); AsyncRequestRateLimiter rateLimiter = getAsyncRateLimiter(rules, timeBandit); diff --git a/ratelimitj-test/src/main/java/es/moki/ratelimitj/test/limiter/request/AbstractReactiveRequestRateLimiterTest.java b/ratelimitj-test/src/main/java/es/moki/ratelimitj/test/limiter/request/AbstractReactiveRequestRateLimiterTest.java index f83e69c..d2bfc95 100644 --- a/ratelimitj-test/src/main/java/es/moki/ratelimitj/test/limiter/request/AbstractReactiveRequestRateLimiterTest.java +++ b/ratelimitj-test/src/main/java/es/moki/ratelimitj/test/limiter/request/AbstractReactiveRequestRateLimiterTest.java @@ -20,7 +20,7 @@ public abstract class AbstractReactiveRequestRateLimiterTest { protected abstract ReactiveRequestRateLimiter getRateLimiter(Set rules, TimeSupplier timeSupplier); @Test - public void shouldLimitSingleWindowReactive() throws Exception { + void shouldLimitSingleWindowReactive() throws Exception { ImmutableSet rules = ImmutableSet.of(RequestLimitRule.of(10, TimeUnit.SECONDS, 5)); ReactiveRequestRateLimiter rateLimiter = getRateLimiter(rules, timeBandit); @@ -39,7 +39,7 @@ public void shouldLimitSingleWindowReactive() throws Exception { } @Test - public void shouldGeLimitSingleWindowReactive() throws Exception { + void shouldGeLimitSingleWindowReactive() throws Exception { ImmutableSet rules = ImmutableSet.of(RequestLimitRule.of(10, TimeUnit.SECONDS, 5)); ReactiveRequestRateLimiter rateLimiter = getRateLimiter(rules, timeBandit); @@ -58,7 +58,7 @@ public void shouldGeLimitSingleWindowReactive() throws Exception { } @Test - public void shouldLimitDualWindowReactive() throws Exception { + void shouldLimitDualWindowReactive() throws Exception { ImmutableSet rules = ImmutableSet.of(RequestLimitRule.of(1, TimeUnit.SECONDS, 5), RequestLimitRule.of(10, TimeUnit.SECONDS, 10)); ReactiveRequestRateLimiter rateLimiter = getRateLimiter(rules, timeBandit); @@ -89,7 +89,7 @@ public void shouldLimitDualWindowReactive() throws Exception { } @Test - public void shouldResetLimit() throws Exception { + void shouldResetLimit() throws Exception { ImmutableSet rules = ImmutableSet.of(RequestLimitRule.of(60, TimeUnit.SECONDS, 1)); ReactiveRequestRateLimiter rateLimiter = getRateLimiter(rules, timeBandit); diff --git a/ratelimitj-test/src/main/java/es/moki/ratelimitj/test/limiter/request/AbstractSyncRequestRateLimiterPerformanceTest.java b/ratelimitj-test/src/main/java/es/moki/ratelimitj/test/limiter/request/AbstractSyncRequestRateLimiterPerformanceTest.java index 7ffe268..2385d7f 100644 --- a/ratelimitj-test/src/main/java/es/moki/ratelimitj/test/limiter/request/AbstractSyncRequestRateLimiterPerformanceTest.java +++ b/ratelimitj-test/src/main/java/es/moki/ratelimitj/test/limiter/request/AbstractSyncRequestRateLimiterPerformanceTest.java @@ -27,7 +27,7 @@ public abstract class AbstractSyncRequestRateLimiterPerformanceTest { protected abstract RequestRateLimiter getRateLimiter(Set rules, TimeSupplier timeSupplier); @Test - public void shouldLimitDualWindowSyncTimed() throws Exception { + void shouldLimitDualWindowSyncTimed() throws Exception { Stopwatch watch = Stopwatch.createStarted(); diff --git a/ratelimitj-test/src/main/java/es/moki/ratelimitj/test/limiter/request/AbstractSyncRequestRateLimiterTest.java b/ratelimitj-test/src/main/java/es/moki/ratelimitj/test/limiter/request/AbstractSyncRequestRateLimiterTest.java index 0a51c78..857855f 100644 --- a/ratelimitj-test/src/main/java/es/moki/ratelimitj/test/limiter/request/AbstractSyncRequestRateLimiterTest.java +++ b/ratelimitj-test/src/main/java/es/moki/ratelimitj/test/limiter/request/AbstractSyncRequestRateLimiterTest.java @@ -22,7 +22,7 @@ public abstract class AbstractSyncRequestRateLimiterTest { protected abstract RequestRateLimiter getRateLimiter(Set rules, TimeSupplier timeSupplier); @Test - public void shouldLimitSingleWindowSync() throws Exception { + void shouldLimitSingleWindowSync() throws Exception { ImmutableSet rules = ImmutableSet.of(RequestLimitRule.of(10, TimeUnit.SECONDS, 5)); RequestRateLimiter requestRateLimiter = getRateLimiter(rules, timeBandit); @@ -36,7 +36,7 @@ public void shouldLimitSingleWindowSync() throws Exception { } @Test - public void shouldGeLimitSingleWindowSync() throws Exception { + void shouldGeLimitSingleWindowSync() throws Exception { ImmutableSet rules = ImmutableSet.of(RequestLimitRule.of(10, TimeUnit.SECONDS, 5)); RequestRateLimiter requestRateLimiter = getRateLimiter(rules, timeBandit); @@ -50,7 +50,7 @@ public void shouldGeLimitSingleWindowSync() throws Exception { } @Test - public void shouldLimitWithWeightSingleWindowSync() throws Exception { + void shouldLimitWithWeightSingleWindowSync() throws Exception { ImmutableSet rules = ImmutableSet.of(RequestLimitRule.of(10, TimeUnit.SECONDS, 10)); RequestRateLimiter requestRateLimiter = getRateLimiter(rules, timeBandit); @@ -64,7 +64,7 @@ public void shouldLimitWithWeightSingleWindowSync() throws Exception { } @Test - public void shouldLimitSingleWindowSyncWithMultipleKeys() throws Exception { + void shouldLimitSingleWindowSyncWithMultipleKeys() throws Exception { ImmutableSet rules = ImmutableSet.of(RequestLimitRule.of(10, TimeUnit.SECONDS, 5)); RequestRateLimiter requestRateLimiter = getRateLimiter(rules, timeBandit); @@ -84,7 +84,7 @@ public void shouldLimitSingleWindowSyncWithMultipleKeys() throws Exception { } @Test - public void shouldResetLimit() { + void shouldResetLimit() { ImmutableSet rules = ImmutableSet.of(RequestLimitRule.of(60, TimeUnit.SECONDS, 1)); RequestRateLimiter requestRateLimiter = getRateLimiter(rules, timeBandit);