Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion src/main/java/com/google/maps/OkHttpRequestHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@ public class OkHttpRequestHandler implements GeoApiContext.RequestHandler {
private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
private final OkHttpClient client = new OkHttpClient();
private final RateLimitExecutorService rateLimitExecutorService;
private final Dispatcher dispatcher;

public OkHttpRequestHandler() {
rateLimitExecutorService = new RateLimitExecutorService();
client.setDispatcher(new Dispatcher(rateLimitExecutorService));
dispatcher = new Dispatcher(rateLimitExecutorService);
client.setDispatcher(dispatcher);
}

@Override
Expand Down Expand Up @@ -95,11 +97,15 @@ public void setWriteTimeout(long timeout, TimeUnit unit) {

@Override
public void setQueriesPerSecond(int maxQps) {
dispatcher.setMaxRequests(maxQps);
dispatcher.setMaxRequestsPerHost(maxQps);
rateLimitExecutorService.setQueriesPerSecond(maxQps);
}

@Override
public void setQueriesPerSecond(int maxQps, int minimumInterval) {
dispatcher.setMaxRequests(maxQps);
dispatcher.setMaxRequestsPerHost(maxQps);
rateLimitExecutorService.setQueriesPerSecond(maxQps, minimumInterval);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
Expand All @@ -47,7 +48,7 @@ public class RateLimitExecutorService implements ExecutorService, Runnable {
// killed when the app exits. For synchronous requests this is ideal but it means any async
// requests still pending after termination will be killed.
private final ExecutorService delegate = new ThreadPoolExecutor(Runtime.getRuntime().availableProcessors(), Integer.MAX_VALUE, 60,
TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(),
TimeUnit.SECONDS, new SynchronousQueue<Runnable>(),
threadFactory("Rate Limited Dispatcher", true));

private final BlockingQueue<Runnable> queue = new LinkedBlockingQueue<Runnable>();
Expand Down