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
12 changes: 6 additions & 6 deletions src/main/java/com/google/maps/GaeRequestHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -102,37 +102,37 @@ public void shutdown() {
public static class Builder implements GeoApiContext.RequestHandler.Builder {

@Override
public void connectTimeout(long timeout, TimeUnit unit) {
public Builder connectTimeout(long timeout, TimeUnit unit) {
// TODO: Investigate if GAE URL Fetch Service supports setting connection timeout
throw new RuntimeException("connectTimeout not implemented for Google App Engine");
}

@Override
public void readTimeout(long timeout, TimeUnit unit) {
public Builder readTimeout(long timeout, TimeUnit unit) {
// TODO: Investigate if GAE URL Fetch Service supports setting read timeout
throw new RuntimeException("readTimeout not implemented for Google App Engine");
}

@Override
public void writeTimeout(long timeout, TimeUnit unit) {
public Builder writeTimeout(long timeout, TimeUnit unit) {
// TODO: Investigate if GAE URL Fetch Service supports setting write timeout
throw new RuntimeException("writeTimeout not implemented for Google App Engine");
}

@Override
public void queriesPerSecond(int maxQps) {
public Builder queriesPerSecond(int maxQps) {
// TODO: Investigate if GAE URL Fetch Service supports setting qps
throw new RuntimeException("queriesPerSecond not implemented for Google App Engine");
}

@Override
public void proxy(Proxy proxy) {
public Builder proxy(Proxy proxy) {
// TODO: Investigate if GAE URL Fetch Service supports setting proxy
throw new RuntimeException("setProxy not implemented for Google App Engine");
}

@Override
public void proxyAuthentication(String proxyUserName, String proxyUserPassword) {
public Builder proxyAuthentication(String proxyUserName, String proxyUserPassword) {
// TODO: Investigate if GAE URL Fetch Service supports setting proxy authentication
throw new RuntimeException("setProxyAuthentication not implemented for Google App Engine");
}
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/google/maps/GeoApiContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -120,17 +120,17 @@ <T, R extends ApiResponse<T>> PendingResult<T> handlePost(
/** Builder pattern for {@code GeoApiContext.RequestHandler}. */
interface Builder {

void connectTimeout(long timeout, TimeUnit unit);
Builder connectTimeout(long timeout, TimeUnit unit);

void readTimeout(long timeout, TimeUnit unit);
Builder readTimeout(long timeout, TimeUnit unit);

void writeTimeout(long timeout, TimeUnit unit);
Builder writeTimeout(long timeout, TimeUnit unit);

void queriesPerSecond(int maxQps);
Builder queriesPerSecond(int maxQps);

void proxy(Proxy proxy);
Builder proxy(Proxy proxy);

void proxyAuthentication(String proxyUserName, String proxyUserPassword);
Builder proxyAuthentication(String proxyUserName, String proxyUserPassword);

RequestHandler build();
}
Expand Down
18 changes: 12 additions & 6 deletions src/main/java/com/google/maps/OkHttpRequestHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -109,34 +109,39 @@ public Builder() {
}

@Override
public void connectTimeout(long timeout, TimeUnit unit) {
public Builder connectTimeout(long timeout, TimeUnit unit) {
builder.connectTimeout(timeout, unit);
return this;
}

@Override
public void readTimeout(long timeout, TimeUnit unit) {
public Builder readTimeout(long timeout, TimeUnit unit) {
builder.readTimeout(timeout, unit);
return this;
}

@Override
public void writeTimeout(long timeout, TimeUnit unit) {
public Builder writeTimeout(long timeout, TimeUnit unit) {
builder.writeTimeout(timeout, unit);
return this;
}

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

@Override
public void proxy(Proxy proxy) {
public Builder proxy(Proxy proxy) {
builder.proxy(proxy);
return this;
}

@Override
public void proxyAuthentication(String proxyUserName, String proxyUserPassword) {
public Builder proxyAuthentication(String proxyUserName, String proxyUserPassword) {
final String userName = proxyUserName;
final String password = proxyUserPassword;

Expand All @@ -152,6 +157,7 @@ public Request authenticate(Route route, Response response) throws IOException {
.build();
}
});
return this;
}

/**
Expand Down