Skip to content

Add support for connection timeouts #19

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

Open
stadlerj wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for connection timeouts #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions src/main/java/com/ciscospark/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,14 @@ class Client {
final String clientId;
final String clientSecret;
final Logger logger;
final private Integer connectTimeout;
final private Integer readTimeout;

Client(URI baseUri, String authCode, URI redirectUri, String accessToken, String refreshToken, String clientId, String clientSecret, Logger logger) {
this(baseUri, authCode, redirectUri, accessToken, refreshToken, clientId, clientSecret, logger, null, null);
}

Client(URI baseUri, String authCode, URI redirectUri, String accessToken, String refreshToken, String clientId, String clientSecret, Logger logger, Integer connectTimeout, Integer readTimeout) {
this.authCode = authCode;
this.redirectUri = redirectUri;
this.baseUri = baseUri;
Expand All @@ -45,6 +51,8 @@ class Client {
this.clientId = clientId;
this.clientSecret = clientSecret;
this.logger = logger;
this.connectTimeout = connectTimeout;
this.readTimeout = readTimeout;
}

<T> T post(Class<T> clazz, String path, T body) {
Expand Down Expand Up @@ -320,6 +328,15 @@ private HttpURLConnection getConnection(URL url) throws IOException {
connection.setRequestProperty("Authorization", authorization);
}
connection.setRequestProperty(TRACKING_ID, UUID.randomUUID().toString());

if(connectTimeout != null) {
connection.setConnectTimeout(connectTimeout);
}

if(readTimeout != null) {
connection.setReadTimeout(readTimeout);
}

return connection;
}

Expand Down
15 changes: 14 additions & 1 deletion src/main/java/com/ciscospark/Spark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,25 @@ public static class Builder {
private String clientSecret;
private Logger logger;
private URI baseUrl = URI.create("https://api.ciscospark.com/v1");
private Integer connectTimeout;
private Integer readTimeout;


public Builder baseUrl(URI uri) {
this.baseUrl = uri;
return this;
}

public Builder connectTimeout(Integer connectTimeout) {
this.connectTimeout = connectTimeout;
return this;
}

public Builder readTimeout(Integer readTimeout) {
this.readTimeout = readTimeout;
return this;
}

public Builder redirectUri(URI uri) {
this.redirectUri = uri;
return this;
Expand Down Expand Up @@ -73,7 +86,7 @@ public Builder logger(Logger logger) {
}

public Spark build() {
return new SparkImpl(new Client(baseUrl, authCode, redirectUri, accessToken, refreshToken, clientId, clientSecret, logger));
return new SparkImpl(new Client(baseUrl, authCode, redirectUri, accessToken, refreshToken, clientId, clientSecret, logger, connectTimeout, readTimeout));
}
}

Expand Down