Skip to content

Commit

Permalink
restore @nullable to OkHttpInvocationBuilder, but use org.jetbrains.a…
Browse files Browse the repository at this point in the history
…nnotations.Nullable
  • Loading branch information
David Byron committed Oct 29, 2018
1 parent d3080a8 commit 1f5b77c
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import okio.BufferedSource;
import okio.Okio;
import okio.Source;
import org.jetbrains.annotations.Nullable;
import org.testcontainers.DockerClientFactory;

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

protected RequestBody toRequestBody(InputStream body, String mediaType) {
protected RequestBody toRequestBody(InputStream body, @Nullable String mediaType) {
return new RequestBody() {
@Nullable
@Override
public MediaType contentType() {
if (mediaType == null) {
Expand Down

0 comments on commit 1f5b77c

Please sign in to comment.