Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add connectTimeout and readTimeout to ServiceOptions #234

Merged
merged 3 commits into from
Oct 9, 2015
Merged

Add connectTimeout and readTimeout to ServiceOptions #234

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77bfdd7
Add connectTimeout and readTimeout to ServiceOptions
mziccard Oct 9, 2015
51bfef6
Add javadoc to ServiceOptions.Builder methods
mziccard Oct 9, 2015
6423879
Add timeout getters and javadocs to StorageOptions
mziccard Oct 9, 2015
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
32 changes: 31 additions & 1 deletion gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import static java.nio.charset.StandardCharsets.UTF_8;

import com.google.api.client.extensions.appengine.http.UrlFetchTransport;
import com.google.api.client.http.HttpRequest;
import com.google.api.client.http.HttpRequestInitializer;
import com.google.api.client.http.HttpTransport;
import com.google.api.client.http.javanet.NetHttpTransport;
Expand Down Expand Up @@ -60,6 +61,8 @@ public abstract class ServiceOptions<
private final AuthCredentials authCredentials;
private final RetryParams retryParams;
private final ServiceRpcFactory<ServiceRpcT, OptionsT> serviceRpcFactory;
private final int connectTimeout;
private final int readTimeout;

public interface HttpTransportFactory extends Serializable {
HttpTransport create();
Expand Down Expand Up @@ -102,6 +105,8 @@ protected abstract static class Builder<
private AuthCredentials authCredentials;
private RetryParams retryParams;
private ServiceRpcFactory<ServiceRpcT, OptionsT> serviceRpcFactory;
private int connectTimeout = -1;
private int readTimeout = -1;

protected Builder() {}

Expand Down Expand Up @@ -150,6 +155,16 @@ public B serviceRpcFactory(ServiceRpcFactory<ServiceRpcT, OptionsT> serviceRpcFa
this.serviceRpcFactory = serviceRpcFactory;
return self();
}

public B connectTimeout(int connectTimeout) {

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

this.connectTimeout = connectTimeout;
return self();
}

public B readTimeout(int readTimeout) {
this.readTimeout = readTimeout;
return self();
}
}

protected ServiceOptions(Builder<ServiceRpcT, OptionsT, ?> builder) {
Expand All @@ -160,6 +175,8 @@ protected ServiceOptions(Builder<ServiceRpcT, OptionsT, ?> builder) {
authCredentials = firstNonNull(builder.authCredentials, defaultAuthCredentials());
retryParams = builder.retryParams;
serviceRpcFactory = builder.serviceRpcFactory;
connectTimeout = builder.connectTimeout;

This comment was marked as spam.

Sign in to view

readTimeout = builder.readTimeout;
}

private static AuthCredentials defaultAuthCredentials() {
Expand Down Expand Up @@ -303,7 +320,20 @@ public ServiceRpcFactory<ServiceRpcT, OptionsT> serviceRpcFactory() {

public HttpRequestInitializer httpRequestInitializer() {
HttpTransport httpTransport = httpTransportFactory.create();
return authCredentials().httpRequestInitializer(httpTransport, scopes());
final HttpRequestInitializer baseRequestInitializer =
authCredentials().httpRequestInitializer(httpTransport, scopes());
return new HttpRequestInitializer() {
@Override
public void initialize(HttpRequest httpRequest) throws IOException {
baseRequestInitializer.initialize(httpRequest);
if (connectTimeout >= 0) {
httpRequest.setConnectTimeout(connectTimeout);
}
if (readTimeout >= 0) {
httpRequest.setReadTimeout(readTimeout);
}
}
};
}

protected int baseHashCode() {
Expand Down