Rename ConcurrencyLimiters#limiter -> acquireLimiter

Author: iamdanfox

okhttp-clients/src/main/java/com/palantir/remoting3/okhttp/ConcurrencyLimiters.java

@@ -57,12 +57,16 @@ class ConcurrencyLimiters {
         this(taggedMetricRegistry, DEFAULT_TIMEOUT);
     }
 
-    Limiter.Listener limiter(Request request) {
-        return limiter(limiterKey(request));
+    /**
+     * Blocks until the request should be allowed to proceed.
+     * Caller must notify the listener to release the permit.
+     */
+    Limiter.Listener acquireLimiter(Request request) {
+        return acquireLimiter(limiterKey(request));
     }
 
     @VisibleForTesting
-    Limiter.Listener limiter(String name) {
+    Limiter.Listener acquireLimiter(String name) {
         Limiter<Void> limiter = limiters.computeIfAbsent(name, key -> newLimiter());
         Optional<Limiter.Listener> listener = limiter.acquire(NO_CONTEXT);
         return listener.orElseGet(() -> {
@@ -74,7 +78,7 @@ Limiter.Listener limiter(String name) {
                             + "bodies (there should be OkHttp log lines indicating this), or service overloading.",
                     SafeArg.of("timeout", timeout));
             limiters.replace(name, limiter, newLimiter());
-            return limiter(name);
+            return acquireLimiter(name);
         });
     }
 

okhttp-clients/src/main/java/com/palantir/remoting3/okhttp/ConcurrencyLimitingInterceptor.java

@@ -69,7 +69,7 @@ final class ConcurrencyLimitingInterceptor implements Interceptor {
 
     @Override
     public Response intercept(Chain chain) throws IOException {
-        Limiter.Listener listener = limiters.limiter(chain.request());
+        Limiter.Listener listener = limiters.acquireLimiter(chain.request());
         try {
             Response response = chain.proceed(chain.request());
             if (DROPPED_CODES.contains(response.code())) {

okhttp-clients/src/test/java/com/palantir/remoting3/okhttp/ConcurrencyLimitersTest.java

@@ -32,7 +32,7 @@ public final class ConcurrencyLimitersTest {
     public void testTimeout() {
         Instant start = Instant.now();
         Thread exhauster = exhaust();
-        limiters.limiter(KEY);
+        limiters.acquireLimiter(KEY);
         Instant end = Instant.now();
         exhauster.interrupt();
         assertThat(Duration.between(start, end)).isGreaterThan(TIMEOUT);
@@ -41,7 +41,7 @@ public void testTimeout() {
     private Thread exhaust() {
         Thread thread = new Thread(() -> {
             while (true) {
-                limiters.limiter(KEY);
+                limiters.acquireLimiter(KEY);
             }
         });
         thread.start();

okhttp-clients/src/test/java/com/palantir/remoting3/okhttp/ConcurrencyLimitingInterceptorTest.java

@@ -61,7 +61,7 @@ public final class ConcurrencyLimitingInterceptorTest {
     public void before() {
         interceptor = new ConcurrencyLimitingInterceptor(limiters);
         when(chain.request()).thenReturn(request);
-        when(limiters.limiter(request)).thenReturn(listener);
+        when(limiters.acquireLimiter(request)).thenReturn(listener);
     }
 
     @Test

okhttp-clients/src/test/java/com/palantir/remoting3/okhttp/FlowControlTest.java

@@ -135,7 +135,7 @@ private Worker(
         @Override
         public void run() {
             for (int i = 0; i < REQUESTS_PER_THREAD;) {
-                Limiter.Listener listener = limiters.limiter("");
+                Limiter.Listener listener = limiters.acquireLimiter("");
                 boolean gotRateLimited = !rateLimiter.tryAcquire(100, TimeUnit.MILLISECONDS);
                 if (!gotRateLimited) {
                     meter.mark();