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.

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

prepare 1.9.1 release #33

Merged
merged 14 commits into from
Mar 21, 2019
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
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ allprojects {
dependencies {
compile "com.squareup.okhttp3:okhttp:3.8.1"
compile "org.slf4j:slf4j-api:1.7.22"
compile "com.google.code.findbugs:jsr305:3.0.2"
testRuntime "ch.qos.logback:logback-classic:1.1.9"
testCompile "org.mockito:mockito-core:1.10.19"
testCompile "junit:junit:4.11"
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/com/launchdarkly/eventsource/EventSource.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Nullable;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
Expand Down Expand Up @@ -69,7 +68,7 @@ public class EventSource implements ConnectionHandler, Closeable {
private volatile HttpUrl url;
private final Headers headers;
private final String method;
@Nullable private final RequestBody body;
private final RequestBody body;
private final RequestTransformer requestTransformer;
private final ExecutorService eventExecutor;
private final ExecutorService streamExecutor;
Expand Down Expand Up @@ -506,7 +505,7 @@ public static final class Builder {
private Authenticator proxyAuthenticator = null;
private String method = "GET";
private RequestTransformer requestTransformer = null;
@Nullable private RequestBody body = null;
private RequestBody body = null;
private OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder()
.connectionPool(new ConnectionPool(1, 1, TimeUnit.SECONDS))
.connectTimeout(DEFAULT_CONNECT_TIMEOUT_MS, TimeUnit.MILLISECONDS)
Expand Down Expand Up @@ -565,7 +564,7 @@ public Builder method(String method) {
* @param body the body to use in HTTP requests
* @return the builder
*/
public Builder body(@Nullable RequestBody body) {
public Builder body(RequestBody body) {
this.body = body;
return this;
}
Expand All @@ -578,7 +577,7 @@ public Builder body(@Nullable RequestBody body) {
*
* @since 1.9.0
*/
public Builder requestTransformer(@Nullable RequestTransformer requestTransformer) {
public Builder requestTransformer(RequestTransformer requestTransformer) {
this.requestTransformer = requestTransformer;
return this;
}
Expand Down