From d3080a80e532f6b32b7d24fe1b159e8760cfd6f6 Mon Sep 17 00:00:00 2001
From: David Byron <david.byron@locationlabs.com>
Date: Mon, 15 Oct 2018 10:15:17 -0700
Subject: [PATCH 1/2] remove @Nullable annotations and dependency on
 com.google.code.findbugs:jsr305

---
 core/build.gradle                                             | 1 -
 .../transport/okhttp/OkHttpInvocationBuilder.java             | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index bda81410355..878970cc89d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -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'
diff --git a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
index ee35cde2ce8..4efc38c5dba 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
@@ -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;
@@ -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) {
         return new RequestBody() {
-            @Nullable
             @Override
             public MediaType contentType() {
                 if (mediaType == null) {

From 1f5b77c65224fc448dc7773f2686bbee87d6e10a Mon Sep 17 00:00:00 2001
From: David Byron <david.byron@locationlabs.com>
Date: Mon, 29 Oct 2018 14:00:43 -0700
Subject: [PATCH 2/2] restore @Nullable to OkHttpInvocationBuilder, but use
 org.jetbrains.annotations.Nullable

---
 .../transport/okhttp/OkHttpInvocationBuilder.java             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
index 4efc38c5dba..e701c16fefa 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
@@ -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;
@@ -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) {