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

remove @Nullable annotations and dependency on com.google.code.findbugs:jsr305 #920

Merged
merged 3 commits into from
Nov 5, 2018
Merged

remove @Nullable annotations and dependency on com.google.code.findbugs:jsr305 #920

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3080a8
remove @Nullable annotations and dependency on com.google.code.findbu…
Oct 15, 2018
1f5b77c
restore @Nullable to OkHttpInvocationBuilder, but use org.jetbrains.a…
Oct 29, 2018
adf3aa0
Merge branch 'master' into removeNullable
kiview Nov 5, 2018
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 core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ dependencies {
compile 'org.slf4j:slf4j-ext:1.7.25'
compile 'org.jetbrains:annotations:15.0'
compile 'javax.annotation:javax.annotation-api:1.3.1'
compile 'com.google.code.findbugs:jsr305:3.0.2'
compile 'org.apache.commons:commons-compress:1.16.1'
// Added for JDK9 compatibility since it's missing this package
compile 'javax.xml.bind:jaxb-api:2.3.0'
Expand Down
4 changes: 1 addition & 3 deletions ...c/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import okio.Source;
import org.testcontainers.DockerClientFactory;

import javax.annotation.Nullable;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -233,9 +232,8 @@ public void put(InputStream body, com.github.dockerjava.core.MediaType mediaType
execute(request).close();
}

protected RequestBody toRequestBody(InputStream body, @Nullable String mediaType) {
protected RequestBody toRequestBody(InputStream body, String mediaType) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should replace this with org.jetbrains.annotations.Nullable? At least this PR would get us to a consistent state, from which point we can consider whether it's worth keeping the jetbrains library in place!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure: 1f5b77c

return new RequestBody() {
@Nullable
@Override
public MediaType contentType() {
if (mediaType == null) {
Expand Down