Fix for docker-java#670 (docker-java#680)

tejksat · KostyaSha · commit c8ab23f0609c · 2016-08-28T18:00:03.000+03:00
JSON decoding disabled on /images/load command execution.
diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -69,6 +69,12 @@ public void onNext(T object) {
         }
     }
 
+    public class SkipResultCallback extends ResultCallbackTemplate<ResponseCallback<Void>, Void> {
+        @Override
+        public void onNext(Void object) {
+        }
+    }
+
     private ChannelProvider channelProvider;
 
     private String resource;
@@ -401,6 +407,31 @@ public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCal
         channel.pipeline().addLast(new JsonObjectDecoder());
         channel.pipeline().addLast(jsonResponseHandler);
 
+        postChunkedStreamRequest(requestProvider, channel, body);
+    }
+
+    public void postStream(InputStream body) {
+        SkipResultCallback resultCallback = new SkipResultCallback();
+
+        HttpRequestProvider requestProvider = httpPostRequestProvider(null);
+
+        Channel channel = getChannel();
+
+        HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
+
+        channel.pipeline().addLast(new ChunkedWriteHandler());
+        channel.pipeline().addLast(responseHandler);
+
+        postChunkedStreamRequest(requestProvider, channel, body);
+
+        try {
+            resultCallback.awaitCompletion();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void postChunkedStreamRequest(HttpRequestProvider requestProvider, Channel channel, InputStream body) {
         HttpRequest request = requestProvider.getHttpRequest(resource);
 
         // don't accept FullHttpRequest here
diff --git a/src/main/java/com/github/dockerjava/netty/exec/LoadImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/LoadImageCmdExec.java
@@ -3,7 +3,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.netty.WebTarget;
@@ -22,8 +21,8 @@ protected Void execute(LoadImageCmd command) {
         WebTarget webResource = getBaseResource().path("/images/load");
 
         LOGGER.trace("POST: {}", webResource);
-        return webResource.request()
-                .post(new TypeReference<Void>() {
-                }, command.getImageStream());
+        webResource.request().postStream(command.getImageStream());
+
+        return null;
     }
 }
